Remove Most of dx-tests

Strip out the dx-tests that no longer compile. The build doesn't
break, because the compilation occurs in a script. These tests
haven't been running as part of CTS and are not maintained at all.

Keep the cfassembler module since that is needed by the vm-tests
which are still maintained. Rename the dx-tests directory to
cfassembler, since that is all that is in it now.

Change-Id: I038054ad0703bdd00af3b7b1012ea9ad3eabd8a6
diff --git a/tools/cfassembler/Android.mk b/tools/cfassembler/Android.mk
new file mode 100644
index 0000000..8e0f351
--- /dev/null
+++ b/tools/cfassembler/Android.mk
@@ -0,0 +1,47 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT 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)
+
+# cfassembler host module
+#============================================================
+
+include $(CLEAR_VARS)
+
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE := cfassembler
+
+include $(BUILD_SYSTEM)/base_rules.mk
+
+$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/cfassembler$(COMMON_JAVA_PACKAGE_SUFFIX)
+$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/cfassembler | $(ACP)
+	@echo "Copy: $(PRIVATE_MODULE) ($@)"
+	$(copy-file-to-new-target)
+	$(hide) chmod 755 $@
+
+INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
+
+# cfassembler java library
+# ============================================================
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := src/dxconvext/ClassFileAssembler.java src/dxconvext/util/FileUtils.java
+LOCAL_JAR_MANIFEST := etc/cfassembler_manifest.txt
+
+LOCAL_MODULE:= cfassembler
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
diff --git a/tools/dx-tests/etc/cfassembler b/tools/cfassembler/etc/cfassembler
similarity index 100%
rename from tools/dx-tests/etc/cfassembler
rename to tools/cfassembler/etc/cfassembler
diff --git a/tools/dx-tests/etc/cfassembler_manifest.txt b/tools/cfassembler/etc/cfassembler_manifest.txt
similarity index 100%
rename from tools/dx-tests/etc/cfassembler_manifest.txt
rename to tools/cfassembler/etc/cfassembler_manifest.txt
diff --git a/tools/dx-tests/src/dxconvext/ClassFileAssembler.java b/tools/cfassembler/src/dxconvext/ClassFileAssembler.java
similarity index 100%
rename from tools/dx-tests/src/dxconvext/ClassFileAssembler.java
rename to tools/cfassembler/src/dxconvext/ClassFileAssembler.java
diff --git a/tools/dx-tests/src/dxconvext/ClassFileParser.java b/tools/cfassembler/src/dxconvext/ClassFileParser.java
similarity index 100%
rename from tools/dx-tests/src/dxconvext/ClassFileParser.java
rename to tools/cfassembler/src/dxconvext/ClassFileParser.java
diff --git a/tools/dx-tests/src/dxconvext/util/FileUtils.java b/tools/cfassembler/src/dxconvext/util/FileUtils.java
similarity index 100%
rename from tools/dx-tests/src/dxconvext/util/FileUtils.java
rename to tools/cfassembler/src/dxconvext/util/FileUtils.java
diff --git a/tools/dx-tests/Android.mk b/tools/dx-tests/Android.mk
deleted file mode 100644
index d249cea..0000000
--- a/tools/dx-tests/Android.mk
+++ /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.
-
-LOCAL_PATH := $(call my-dir)
-
-# run-dx-tests host module
-#===========================================================
-
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE := dx-tests
-
-LOCAL_JAVA_LIBRARIES := dx
-
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-ALL_SRC_FILES := $(patsubst ./%,%,$(shell cd $(LOCAL_PATH) && find src/dxc/junit -name "*.java" -o -name "*.j" -o -name "*.cfh"))
-ABSOLUTE_SRC_FILES := $(addprefix $(LOCAL_PATH)/,$(ALL_SRC_FILES))
-
-$(LOCAL_BUILT_MODULE): PRIVATE_CURRENT_MODULE_SCRIPT := $(LOCAL_PATH)/etc/compileall
-$(LOCAL_BUILT_MODULE): PRIVATE_BASE := $(LOCAL_PATH)
-$(LOCAL_BUILT_MODULE): PRIVATE_INTERMEDIATES := $(intermediates)
-$(LOCAL_BUILT_MODULE): $(DX) $(TARGET_OUT_EXECUTABLES)/dalvikvm
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/starttests $(LOCAL_PATH)/etc/compileall ${ABSOLUTE_SRC_FILES} $(HOST_OUT_JAVA_LIBRARIES)/dx.jar $(HOST_OUT_JAVA_LIBRARIES)/cfassembler.jar | $(ACP)
-	@echo "Copy: $(PRIVATE_MODULE) ($@)"
-	$(copy-file-to-new-target)
-	$(hide) chmod 755 $@
-	$(hide) PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(PRIVATE_CURRENT_MODULE_SCRIPT) "$(PRIVATE_BASE)" "$(HOST_JAVAC)" "$(PRIVATE_INTERMEDIATES)" "$(HOST_OUT_JAVA_LIBRARIES)/dx.jar:$(HOST_OUT_JAVA_LIBRARIES)/cfassembler.jar" "$(HOST_OUT)"
-
-# cfassembler host module
-#============================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE := cfassembler
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/cfassembler$(COMMON_JAVA_PACKAGE_SUFFIX)
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/cfassembler | $(ACP)
-	@echo "Copy: $(PRIVATE_MODULE) ($@)"
-	$(copy-file-to-new-target)
-	$(hide) chmod 755 $@
-
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
-
-# cfassembler java library
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := src/dxconvext/ClassFileAssembler.java src/dxconvext/util/FileUtils.java
-LOCAL_JAR_MANIFEST := etc/cfassembler_manifest.txt
-
-LOCAL_MODULE:= cfassembler
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
diff --git a/tools/dx-tests/dx-tests.css b/tools/dx-tests/dx-tests.css
deleted file mode 100644
index a315a73..0000000
--- a/tools/dx-tests/dx-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/dx-tests/dx-tests.html b/tools/dx-tests/dx-tests.html
deleted file mode 100644
index 832f701..0000000
--- a/tools/dx-tests/dx-tests.html
+++ /dev/null
@@ -1,141 +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>DX Converter Test Suite</title>
-    <link rel=stylesheet href="dx-tests.css">
-  </head>
-
-  <body>
-    <h1>DX Converter Test Suite</h1>
-    <p>Version 1.0</p>
-    <p>Copyright &copy; 2008 The Android Open Source Project
-
-    <h2>Overview</h2>
-
-    <p>    
-      This directory contains a test suite for the DX converter. It tests the
-      capabilities of the DX converter in a black-box manner, based on the
-      usual specifications for <code>.class</code> files. The suite does both
-      functional and verifier tests. Regarding the latter, the DX converter has
-      only limited bytecode verification capabilities, but the combination of DX
-      and the Dalvik VM is supposed to perform bytecode verification equivalent
-      to that done in other virtual machines. Please see
-        
-      <pre>
-        docs/dalvik/java-constraints.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 dx-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>
-        dx-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>
-        dx-tests anewarray
-      </pre>
-      
-      executes the tests for the <code>anewarray</code> instruction.
-      Please see the corresponding specification for all the mnemonics. Two
-      additional parameters are possible that don't represent instructions.
-      These run sanity checks for the suite itself and general verifier tests,
-      respectively: 
-
-      <pre>
-        dx-tests sanity
-        dx-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 suite might easily take 30 minutes or more for execution,
-      depending on the environment. It will generate a full 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 results 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>Warning</td>
-          <td>W</td>
-          <td>
-            A verifier test case threw <code>VerifyError</code>, where a
-            different VM would have thrown a different exception. This is
-            specified Dalvik behavior, though, hence just the warning.
-          </td>
-        </tr>
-      </table> 
-  </body>
-</html>
diff --git a/tools/dx-tests/etc/compileall b/tools/dx-tests/etc/compileall
deleted file mode 100755
index 57bcec6..0000000
--- a/tools/dx-tests/etc/compileall
+++ /dev/null
@@ -1,114 +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.
-
-echo "building dx-test-suite"
-#
-# generates .class files from the .j (jasmin) and .cfh (hex format) files for the dxconverter test project.
-# the dx executable must be on the PATH.
-# only for lunch 2 at the moment - TODO check which commands are available in busybox/toolbox on the device
-#
-
-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
-
-#echo "progdir: $progdir"
-#echo "android build top: $ANDROID_BUILD_TOP"
-project_home=$1
-javac=$2
-tmpdir=$3 # ANDROID_BUILD_TOP/$3
-dxjarpath=$4
-outdir=$5
-project_src=$project_home/src
-project_lib=$project_home/lib
-project_data=$project_home/data
-javac_out=$tmpdir/classout
-javafiles=$tmpdir/_javafiles
-mainfilesdir=$tmpdir/mainfiles
-mainfileslist=$tmpdir/_mainfileslist
-
-#echo "home: $project_home"
-
-if [ "$tmpdir" = "" ]; then
-    echo "error: intermediates dir not set/found!!";
-    exit 1;
-else
-    echo "tmp/intermediates dir (rel): $tmpdir"
-fi
-rm -rf $javac_out
-rm -rf $javafiles
-
-# compile all files from javafiles
-echo "compiling all java files (with package dxc.junit.**)"
-find $project_src/dxc/junit -name '*.java' > $javafiles
-echo "$project_src/util/CollectAllTests.java" >> $javafiles
-mkdir -p $javac_out
-jfiles=\@$javafiles
-javac -d $javac_out -classpath ${dxjarpath} -sourcepath $project_src $jfiles
-
-echo "compiling all jasmin (*.j)"
-
-find $project_src/dxc/junit -name '*.j' | sort > $tmpdir/alljasminfiles
-java -classpath $project_home/utilclasses:$project_lib/jasmin.jar util.CompileAllJasmin $tmpdir/alljasminfiles $javac_out  &> /dev/null
-
-echo "compiling all .cfh files into .class files"
-for acfhfile in `find $project_src/dxc/junit -name '*.cfh'`
-do
-    #echo "cfh file:$acfhfile"
-    java -classpath ${dxjarpath} dxconvext.ClassFileAssembler $acfhfile $javac_out &> /dev/null
-done
-
-echo "generating Main_*.java files reading from $project_home writing to $mainfilesdir"
-mkdir -p $mainfilesdir
-# generate the Main_*.java files
-java -cp $project_lib/junit.jar:$javac_out util.CollectAllTests $project_home $mainfilesdir 
-# compile the Main_*.java files
-find $mainfilesdir/dxc/junit -name '*.java' > $mainfileslist
-echo "compile the Main_*.java files"
-javac -d $javac_out -classpath $project_lib/junit.jar:$javac_out -sourcepath $mainfilesdir \@$mainfileslist
-
-# now copy relevant data from intermediates dir to its final destination
-fdest=$outdir/cts/dxconverter
-mkdir -p $fdest/data
-acp -r $javac_out $fdest/
-acp $mainfilesdir/data/scriptdata $fdest/data/scriptdata
-
-echo "dxconverter test suite sucessfully built!"
-echo "intermediate Main_*.java files (for stacktrace analysis) can be found under $mainfilesdir" 
-
diff --git a/tools/dx-tests/etc/morescripts/countTests.sh b/tools/dx-tests/etc/morescripts/countTests.sh
deleted file mode 100755
index ff0b323..0000000
--- a/tools/dx-tests/etc/morescripts/countTests.sh
+++ /dev/null
@@ -1,29 +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.
-
-cd ../../src
-
-echo "normal tests (testN...): "
-egrep -R 'public void testN[0-9][0-9]?' * | grep ".java" | sed -e '/.svn/d' | sort | wc -l
-
-echo "border egde tests (testB...): "
-egrep -R 'public void testB[0-9][0-9]?' * | grep ".java" | sed -e '/.svn/d' | sort | wc -l
-
-echo "exception tests (testE...): "
-egrep -R 'public void testE[0-9][0-9]?' * | grep ".java" | sed -e '/.svn/d' | sort | wc -l
-
-echo "verify error tests (testVFE...): "
-egrep -R 'public void testVFE[0-9][0-9]?' * | grep ".java" | sed -e '/.svn/d' | sort | wc -l
diff --git a/tools/dx-tests/etc/morescripts/detailCount.sh b/tools/dx-tests/etc/morescripts/detailCount.sh
deleted file mode 100755
index c7aae42..0000000
--- a/tools/dx-tests/etc/morescripts/detailCount.sh
+++ /dev/null
@@ -1,30 +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.
-
-#
-# sed -e '/.svn/d' |
-# ---------------------------------------------------------
-
-echo ">>> statistics about kind of tests (normal, border edge, exception, verify)"
-cd ../../src
-for mypack in `find dxc -maxdepth 4 -mindepth 4 -name "Test_*.java" | sort`
-do
-    resN=`egrep -c 'public void testN[0-9][0-9]?' $mypack`
-    resB=`egrep -c 'public void testB[0-9][0-9]?' $mypack`
-    resE=`egrep -c 'public void testE[0-9][0-9]?' $mypack`
-    resVFE=`egrep -c 'public void testVFE[0-9][0-9]?' $mypack`
-    echo "file:$mypack, N:$resN, B:$resB, E:$resE, VFE:$resVFE"
-done
diff --git a/tools/dx-tests/etc/starttests b/tools/dx-tests/etc/starttests
deleted file mode 100755
index b062fe7..0000000
--- a/tools/dx-tests/etc/starttests
+++ /dev/null
@@ -1,341 +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
-
-#exec java $javaOpts -jar $libdir/hat.jar "$@"
-
-#######################################################################
-# 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
-
-datadir=/tmp/${USER}
-rm -rf $datadir/dalvik-cache
-mkdir -p $datadir
-mkdir -p $datadir/dalvik-cache
-
-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"
-exe=$base/system/bin/dalvikvm
-bpath=$framework/core.jar
-BASEDIR=$progdir/../cts/dxconverter
-
-echo "--------------------------------------------------"
-echo "DX Converter Test Suite"
-echo "Version 1.0"
-echo "Copyright (c) 2008 The Android Open Source Project"
-echo ""
-
-if [ "$selection" = "--help" ]; then
-    echo "Usage: dx-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
-
-# we need for launching: the dx tool, the dalvikvm executable, and the directory with all .class files
-# - prep dxcore.jar
-# - init reportfile
-# for each package as stated in data/scriptdata (like dxc/junit/opcode/aaload) do
-#   - clear tmpoutput
-#   - try to dx Test_opcode.class and all .class files in the ./jm directory into a classes.jar file
-#   - launch dalvikvm, let it write output &> to tmpoutput (surrounded by magic key for start/stop)
-#   - look at tmpoutput -> green or red test result
-#   - append the result to the report.html file (table form)
-#   - clear the tmpoutput, the classes.jar etc.
-# end for
-# - close the report file and cat its path to stdout
-
-# sanity checks:
-# dx around?
-curmode=""
-dx --version &> /dev/null
-if [ ! $? -eq 0 ]
-then
-    echo "error:could not start dx tool"
-    exit 1;
-fi
- 
-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 ""
-
-latestpath=""
-curdate=`date`
-dxtmpdir=$BASEDIR/dxtmp
-dxruntmpdir=$BASEDIR/dxruntmp
-javac_out=$BASEDIR/classout
-report=$BASEDIR/report.html
-mkdir -p $dxtmpdir
-rm -f $report
-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>DX 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>"
-echo $pre_report > $report
-
-# ----------- generating dxcore.jar
-cd $javac_out
-# consists of dxc.junit.DxAbstractMain and dxc.junit.DxUtil
-dx --dex --positions=lines --output="$BASEDIR/dxcore.jar" dxc/junit/DxAbstractMain.class dxc/junit/DxUtil.class
-
-# ----------- generating jars for each opcode test ------------
-
-export jpassedcnt=0
-export jwarningcnt=0
-export jvfefailedcnt=0
-export jfailedcnt=0
-export jallcnt=0
-export jcolumns=0
-
-function classnameToPath()
-{
-    echo $1 | sed -e 's#\.#/#g;s#$#.class#'
-}
-
-function lecho()
-{
-    if [ ! -z $CTS_DX_DEBUG ]; then echo $@; fi
-}
-
-while read -u 3 myline;
-do
-    mainclass=`echo $myline | cut -d";" -f1` # e.g dxc.junit.verify.t482_9.Main_testVFE2
-    classfiles=`classnameToPath $mainclass`
-    
-    testclasses=`echo $myline | cut -d";" -f2` # e.g dxc.junit.verity.t482_9.jm.T_t482_9_1
-    
-    for testclass in $testclasses; do
-        classfiles="$classfiles "`classnameToPath $testclass`;
-    done
-    
-    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 ))   
-    
-    
-        rm -rf $dxtmpdir/*
-        mkdir -p $dxtmpdir
-        cd $dxtmpdir            
-        
-        for testclass in $classfiles; do
-            lecho -n "dexing $testclass : "
-            mkdir -p `dirname ${dxtmpdir}/${testclass}`
-            cp ${javac_out}/${testclass} ${dxtmpdir}/${testclass}
-            
-            dx --dex --positions=lines $testclass &>/dev/null
-            
-            if [ $? -eq 0 ]; then
-                lecho " dexable";
-            else
-                lecho " not dexable->remove";
-                rm $testclass
-            fi
-        done
-        
-        dx --dex --positions=lines --output="$BASEDIR/dxclasses.jar" .
-            
-        # run the previously prepared jar files in the dalvik vm.
-        # the dalvik vm executable (dalvikvm) must be on the PATH.
-        # 
-        ### echo -n ">>> launch dalvikvm for class: $mainclass"
-        cd $BASEDIR
-        rm -f $BASEDIR/dalvikout
-        # write dalvik output to file
-        echo -n "mk_b:" > $BASEDIR/dalvikout
-            #echo ">>> launch dex package -classpath $BASEDIR/dxcore.jar:$BASEDIR/dxclasses.jar $mainclass"
-    
-        if [ "$TARGET_SIMULATOR" = "true" ]; then
-            ### echo " on simulator";
-            $valgrind $exe -Xint:$interpreter -Xmx512M -Xss32K -Xbootclasspath:$bpath -DacceptCNF=true -classpath $BASEDIR/dxcore.jar:$BASEDIR/dxclasses.jar $debug_opts $mainclass "$@" >> $BASEDIR/dalvikout 2>&1
-            RESULTCODE=$?
-            if [ ${RESULTCODE} -ne 0 ]; then
-                echo "execute dalvikvm failed with resultcode: ${RESULTCODE}" >> $BASEDIR/dalvikout 2>&1
-            fi
-        else
-            # adb shell dalvikvm -Xint:$interpreter -Djava.io.tmpdir=/data/local/tmp -classpath /data/dxcore.jar:/data/dxclasses.jar dxc.junit.opcodes.aload.Main_testN2
-            # either no output (ok) or
-            # java.lang.RuntimeException: test did not cause the expected verify error, but:java.lang.RuntimeException, msg:AssertionFailedError msg:expected a verification exception
-            #    at dxc.junit.DxUtil.checkVerifyException(DxUtil.java:65)
-            #    at dxc.junit.opcodes.aload.Test_aload.testVFE10(Test_aload.java:181)
-            #    at dxc.junit.opcodes.aload.Main_testVFE10.main(Main_testVFE10.java:5)
-            #    at dalvik.system.NativeStart.main(Native Method)
-        
-            ### echo " on emulator/device with adb push"
-            adb push $BASEDIR/dxcore.jar /data/dxcore.jar &> /dev/null
-            adb push $BASEDIR/dxclasses.jar /data/dxclasses.jar &> /dev/null
-            adb shell "dalvikvm -Djava.io.tmpdir=/data/local/tmp -classpath /data/dxcore.jar:/data/dxclasses.jar $mainclass && echo -n dvmpassed:" >> $BASEDIR/dalvikout 2>&1
-        fi
-        
-        echo -n "mk_s:" >> $BASEDIR/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
-        ### echo "vmresult: $vmresult"
-        vmresult=`cat $BASEDIR/dalvikout`
-        if [[ ("$vmresult" == "mk_b:mk_s:") || ("$vmresult" == "mk_b:dvmpassed:mk_s:") ]]; then
-            (( jpassedcnt += 1 )) 
-            echo "<tr class=\"ok\"><td>Success</td><td>$jtitle</td><td>$jcomment</td><td>$details</td></tr>" >> $report
-            ### echo " -> PASSED (passed:$jpassedcnt, failed:$jfailedcnt, vfe failed:$jvfefailedcnt, warnings:$jwarningcnt)"
-            echo -n "."
-        elif [[ ("$vmresult" == "mk_b:dvmvfe:mk_s:") || ("$vmresult" == "mk_b:dvmvfe:dvmpassed:mk_s:") ]]; then
-            (( jwarningcnt += 1 )) 
-            echo "<tr class=\"wok\"><td>Warning</td><td>$jtitle</td><td>$jcomment</td><td>Special behavior regarding VerifyError</td></tr>" >> $report
-            ### echo " -> WARNING (passed:$jpassedcnt, failed:$jfailedcnt, vfe failed:$jvfefailedcnt, warnings:$jwarningcnt)"
-            echo -n "W"
-        else
-           vmres=`cat $BASEDIR/dalvikout | sed -e 's/mk_b://;s/mk_s://'`
-           vmres="$details<br><pre>$vmres</pre>"    
-            # red with additional info if a VFE failed, red if either a N,B, or E failed
-            jtype=`echo "$mainclass" | sed -e 's/.*_test\([^0-9]*\)[0-9].*/\1/' `
-            if [ "$jtype" == "VFE" ]; then
-                (( jvfefailedcnt += 1 ))
-                echo -n "<tr class=\"nok\"><td>Verifier failure</td><td>$jtitle</td><td>$jcomment</td><td>$vmres</td></tr>" >> $report
-                ### echo " -> VFE FAILED (passed:$jpassedcnt, failed:$jfailedcnt, vfe failed:$jvfefailedcnt, warnings:$jwarningcnt)"
-                echo -n "V"
-            else
-                (( jfailedcnt += 1 )) 
-                echo -n "<tr class=\"nok\"><td>Functional failure</td><td>$jtitle</td><td>$jcomment</td><td>$vmres</td></tr>" >> $report
-                ### echo " -> FAILED (passed:$jpassedcnt, failed:$jfailedcnt, vfe failed:$jvfefailedcnt, warnings:$jwarningcnt)"
-                echo -n "F"
-            fi
-        fi
-        
-        (( jcolumns += 1 ))
-        if [ ${jcolumns} -eq 40 ]; then
-            echo ""
-            (( jcolumns = 0 ))
-        fi
-        
-    fi
-      
-done 3<$BASEDIR/data/scriptdata #we use fd nr 3 to avoid subshelling via cat since this looses all variables (and thus also the counters we are interested in).
-
-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 "<br>Tests run: ${jallcnt}" >> $report
-echo "<br>Functional failures: ${jfailedcnt}" >> $report
-echo "<br>Verifier failures: ${jvfefailedcnt}" >> $report
-echo "<br>Warnings: ${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 "Warnings           : ${jwarningcnt}"
-fi
-
-echo ""
-echo "Please see complete report in ${report}"
-echo "--------------------------------------------------"
diff --git a/tools/dx-tests/lib/jasmin.jar b/tools/dx-tests/lib/jasmin.jar
deleted file mode 100644
index 87db0d0..0000000
--- a/tools/dx-tests/lib/jasmin.jar
+++ /dev/null
Binary files differ
diff --git a/tools/dx-tests/lib/junit.jar b/tools/dx-tests/lib/junit.jar
deleted file mode 100644
index 674d71e..0000000
--- a/tools/dx-tests/lib/junit.jar
+++ /dev/null
Binary files differ
diff --git a/tools/dx-tests/scripts/assemble_cfh.sh b/tools/dx-tests/scripts/assemble_cfh.sh
deleted file mode 100755
index 0c8e9c7..0000000
--- a/tools/dx-tests/scripts/assemble_cfh.sh
+++ /dev/null
@@ -1,35 +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.
-
-# compiles all .cfh files into .class files
-abase=`pwd`
-srcd="$abase/src"
-cout=$abase/out/classes_cfh
-cp=$abase/out/classes_jasmin
-cp2=$abase/out/classes_javac
-
-echo "del old files"
-rm -rf $cout/*
-echo "done del"
-
-echo "src folder:$srcd"
-for myfile in `find $srcd -name "*.cfh"`
-do
-    echo "file:$myfile"
-    java -cp $cout:$cp:$cp2 dxconvext.ClassFileAssembler $myfile $cout
-done
-
-echo "Done!"
diff --git a/tools/dx-tests/scripts/collect_dasm_files.sh b/tools/dx-tests/scripts/collect_dasm_files.sh
deleted file mode 100644
index d4275c0..0000000
--- a/tools/dx-tests/scripts/collect_dasm_files.sh
+++ /dev/null
@@ -1,154 +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.
-
-BASEDIR=`pwd`
-CLASSFOLDERS='out/classes_cfh out/classes_jasmin out/classes_javac'
-
-function findClassFile()
-{
-    i=0;
-    for path in $1; 
-    do
-        if [ -f ${path}/$2 ]; then
-            CLASSFOLDER=$path
-            return
-        fi
-    done
-}
-
-function mapOpcode()
-{
-    MAPPED_OPCODE=""
-    if [ -z $1 ]; then
-        MAPPED_OPCODE=""
-        return;
-    fi
-    
-    line=`grep -e "^$1    " ${BASEDIR}/data/opcode_mapping`
-    if [ $? -ne 0 ]; then
-        MAPPED_OPCODE=""
-    else
-        echo $line
-        MAPPED_OPCODE=`echo -n $line | cut -d" " -f2`
-    fi
-}
-
-while read -u 3 myline;
-do
-    jpackageclass=`echo $myline | cut -d";" -f1` # e.g dxc.junit.verify.t482_9.Main_testVFE2
-    jpackageclassfile=`echo $jpackageclass | sed -e 's/\./\//g;s/$/.java/'`
-    echo $jpackageclassfile
-    jtestclass=`echo $myline | cut -d";" -f2` # e.g dxc.junit.verity.t482_9.jm.T_t482_9_1
-    jtestclassfile=`echo $jtestclass | sed -e 's/\./\//g;s/$/.class/'`
-    jtestsourcefile=`echo $jtestclass | sed -e 's/\./\//g;s/$/.java/'`
-#    echo $jtestclassfile
-    
-rm -rf out/tmp
-mkdir -p out/tmp
-
-findClassFile "${CLASSFOLDERS}" $jtestclassfile
-cd ${CLASSFOLDER}
-cp -P --parent $jtestclassfile ${BASEDIR}/out/tmp/
-cd ${BASEDIR}
-
-#findClassFile "${CLASSFOLDERS}" $jpackageclassfile
-#cd ${CLASSFOLDER}
-#cp -P --parents $jpackageclassfile ${BASEDIR}/out/tmp/
-#cd ${BASEDIR}
-
-# echo ${CLASSFOLDER}/${jtestclassfile}
-
-OPCODE=`echo $jtestclass | sed -e 's/.*T_\(.*\)_[0-9]\+[_]*[a-z]*/\1/'`
-mapOpcode ${OPCODE}
-# echo ${OPCODE} " - " ${MAPPED_OPCODE}
-if [ -z ${MAPPED_OPCODE} ]; then
-    continue
-fi
-
-for subcode in `echo $MAPPED_OPCODE | cut -d";" -f1,2 --output-delimiter=" "`; do
-
-    SCRIPT="s#out/classes_[^/]*/dxc/\(.*\)/${OPCODE}/jm/T_${OPCODE}\(.*\)\.class#src/dot/\1/${subcode}/d/T_${subcode}\2.d#"
-    FILEDEST=`echo ${CLASSFOLDER}/${jtestclassfile} | sed -e $SCRIPT`
-    echo ${FILEDEST}
-#    SCRIPT="s#out/classes_[^/]*/dxc/\(.*\)${OPCODE}/Main_\(.*\)\.class#src/dot/\1/${subcode}/Main_\2.d#"
-#    FILEDEST=`echo ${CLASSFOLDER}/${jpackageclassfile} | sed -e $SCRIPT`
-#    echo ${FILEDEST}
-    
-    cd out/tmp
-    OUT=`dx --dex --no-optimize --positions=lines --output="/tmp/dxclasses.jar" ${jtestclassfile} 2>&1`
-    
-    if [ $? -eq 0 ]; then
-        cd ${BASEDIR}
-        mkdir -p `dirname ${FILEDEST}`
-        dexdump -g /tmp/dxclasses.jar > ${FILEDEST}
-        sed -i -e 's/dxc\([\.|\/]\)junit/dot\1junit/' ${FILEDEST}
-        SCRIPT="s/${OPCODE}\([\.|\/]\)jm\([\.|\/]\)/${subcode}\1d\2/g"
-        sed -i -e ${SCRIPT} ${FILEDEST}
-        SCRIPT="s/T_${OPCODE}/T_${subcode}/g"
-        sed -i -e ${SCRIPT} ${FILEDEST}
-        
-        SCRIPT="s#dxc/\(.*\)/${OPCODE}/\(.*\)#src/dot/\1/${subcode}/\2#"
-        jpackagedestfile=`echo ${jpackageclassfile} | sed -e $SCRIPT`
-        cp src/${jpackageclassfile} ${jpackagedestfile}
-        sed -i -e 's/dxc\([\.|\/]\)junit/dot\1junit/' ${jpackagedestfile}
-        SCRIPT="s/${OPCODE}\([\.|\/]\)jm\([\.|\/]\)/${subcode}\1d\2/g"
-        sed -i -e ${SCRIPT} ${jpackagedestfile}
-        SCRIPT="s/T_${OPCODE}/T_${subcode}/g"
-        sed -i -e ${SCRIPT} ${jpackagedestfile}
-        sed -i -e "s/\(package .*\)${OPCODE}/\1${subcode}/" ${jpackagedestfile}
-
-
-        SCRIPT="s#dxc/\(.*\)/${OPCODE}/jm/\(.*\)${OPCODE}\(.*\).class#src/dot/\1/${subcode}/d/\2${subcode}\3.java#"
-        jpackagedestfile=`echo ${jtestclassfile} | sed -e $SCRIPT`
-        cp src/${jtestsourcefile} ${jpackagedestfile}
-        sed -i -e 's/dxc\([\.|\/]\)junit/dot\1junit/' ${jpackagedestfile}
-        SCRIPT="s/${OPCODE}\([\.|\/]\)jm\([\.|\/|;]\)/${subcode}\1d\2/g"
-        sed -i -e ${SCRIPT} ${jpackagedestfile}
-        SCRIPT="s/T_${OPCODE}/T_${subcode}/g"
-        sed -i -e ${SCRIPT} ${jpackagedestfile}
-        sed -i -e "s/\(package .*\)${OPCODE}/\1${subcode}/" ${jpackagedestfile}
-        
-        srcdir=`dirname ${jtestsourcefile}`
-        for srcfile in `find src/${srcdir} -maxdepth 1 -type f ! -name "T_*.java" -a -name "*.java"`; do
-            echo $srcfile
-            SCRIPT="s#dxc/\(.*\)/${OPCODE}/jm/\(.*\).java#dot/\1/${subcode}/d/\2.java#"
-            jpackagedestfile=`echo ${srcfile} | sed -e $SCRIPT`
-            cp ${srcfile} ${jpackagedestfile}
-            sed -i -e 's/dxc\([\.|\/]\)junit/dot\1junit/' ${jpackagedestfile}
-            SCRIPT="s/${OPCODE}\([\.|\/]\)jm\([\.|\/|;]\)/${subcode}\1d\2/g"
-            sed -i -e ${SCRIPT} ${jpackagedestfile}
-            SCRIPT="s/T_${OPCODE}/T_${subcode}/g"
-            sed -i -e ${SCRIPT} ${jpackagedestfile}
-            sed -i -e "s/\(package .*\)${OPCODE}/\1${subcode}/" ${jpackagedestfile}
-        done
-        
-        srcdir=`dirname ${jpackageclassfile}`
-        for srcfile in `find src/${srcdir} -maxdepth 1 -type f ! -name "Main_*.java" -a ! -name "Test_*.java" -a -name "*.java"`; do
-            echo $srcfile
-            SCRIPT="s#dxc/\(.*\)/${OPCODE}/\(.*\)#dot/\1/${subcode}/\2#"
-            jpackagedestfile=`echo ${srcfile} | sed -e $SCRIPT`
-            cp -v ${srcfile} ${jpackagedestfile}
-        done
-        
-    else
-        echo "--- not dexable"
-    fi
-    cd ${BASEDIR}
-done
-
-
-done 3<$BASEDIR/data/scriptdata
-
diff --git a/tools/dx-tests/scripts/jm.sh b/tools/dx-tests/scripts/jm.sh
deleted file mode 100755
index c9c1848..0000000
--- a/tools/dx-tests/scripts/jm.sh
+++ /dev/null
@@ -1,21 +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.
-
-# 
-echo "compile jasmin files"
-rm -rf out/classes_jasmin/*
-java -jar lib/jasmin.jar -d out/classes_jasmin src/dxc/junit/**/**/**/*.j
-echo "Done!"
\ No newline at end of file
diff --git a/tools/dx-tests/scripts/validate-tests.sh b/tools/dx-tests/scripts/validate-tests.sh
deleted file mode 100755
index df73cf1..0000000
--- a/tools/dx-tests/scripts/validate-tests.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# Quick and dirty way to validate the DX tests against a JVM. Note that
-# even the JVM has different bugs and verification behavior depending
-# on the version. The tests pass 100% for the following setup:
-# 
-# java version "1.6.0"
-# Java(TM) SE Runtime Environment (build 1.6.0-b105)
-# Java HotSpot(TM) Server VM (build 1.6.0-b105, mixed mode)
-#
-# Linux ... 2.6.18.5-gg42workstation-mixed64-32 #1 SMP
-# Tue Nov 25 21:45:59 PST 2008 x86_64 GNU/Linux
-#
-# You can only run the tests if the "dx-tests" target has been built before.
-# 
-java -cp ./lib/junit.jar:$ANDROID_BUILD_TOP/out/target/common/cts/dxconverter/classout/ junit.textui.TestRunner dxc.junit.AllTests
-
-
diff --git a/tools/dx-tests/src/dxc/Main.java b/tools/dx-tests/src/dxc/Main.java
deleted file mode 100644
index 04031da..0000000
--- a/tools/dx-tests/src/dxc/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 dxc;
-
-import dxc.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/dx-tests/src/dxc/junit/AllTests.java b/tools/dx-tests/src/dxc/junit/AllTests.java
deleted file mode 100644
index d5867bf..0000000
--- a/tools/dx-tests/src/dxc/junit/AllTests.java
+++ /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.
- */
-
-package dxc.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 basic functionality
-        suite.addTest(dxc.junit.argsreturns.AllTests.suite());
-        // tests all opcodes
-        suite.addTest(dxc.junit.opcodes.AllTests.suite());
-        // tests all constraints that should be enforced by the verifier,
-        // but which do apply to more than one bytecode
-        suite.addTest(dxc.junit.verify.AllTests.suite());
-        return suite;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/DxAbstractMain.java b/tools/dx-tests/src/dxc/junit/DxAbstractMain.java
deleted file mode 100644
index 157e489..0000000
--- a/tools/dx-tests/src/dxc/junit/DxAbstractMain.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 dxc.junit;
-
-public class DxAbstractMain {
-    
-    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/dx-tests/src/dxc/junit/DxTestCase.java b/tools/dx-tests/src/dxc/junit/DxTestCase.java
deleted file mode 100644
index 00b57e8..0000000
--- a/tools/dx-tests/src/dxc/junit/DxTestCase.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 dxc.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/dx-tests/src/dxc/junit/DxUtil.java b/tools/dx-tests/src/dxc/junit/DxUtil.java
deleted file mode 100644
index f1c90b3..0000000
--- a/tools/dx-tests/src/dxc/junit/DxUtil.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 dxc.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 ClassNotFoundException || t instanceof LinkageError) {
-                if (t instanceof VerifyError) {
-                    if (((VerifyError)t).getMessage().contains("Main_")) {
-                        System.out.print("verify failed on Main_");
-                    }
-                }
-                // ok, this is what we expected
-        } else {
-            throw new RuntimeException("Verify error expected", t);
-        }
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/argsreturns/AllTests.java b/tools/dx-tests/src/dxc/junit/argsreturns/AllTests.java
deleted file mode 100644
index fc32868..0000000
--- a/tools/dx-tests/src/dxc/junit/argsreturns/AllTests.java
+++ /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.
- */
-
-package dxc.junit.argsreturns;
-
-import dxc.junit.argsreturns.pargsreturn.Test_pargsreturn;
-
-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 basic java vm opcodes: "
-                + "calling method with parameters and return");
-        suite.addTestSuite(Test_pargsreturn.class);
-        return suite;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/Test_pargsreturn.java b/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/Test_pargsreturn.java
deleted file mode 100644
index e6f0f04..0000000
--- a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/Test_pargsreturn.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 dxc.junit.argsreturns.pargsreturn;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.argsreturns.pargsreturn.jm.T1;
-import dxc.junit.argsreturns.pargsreturn.jm.T2;
-import dxc.junit.argsreturns.pargsreturn.jm.T3;
-import dxc.junit.argsreturns.pargsreturn.jm.T4;
-
-public class Test_pargsreturn extends DxTestCase {
-
-    /**
-     * @title checks return value of a constant
-     */
-    public void testN1() {
-        assertEquals(1234, new T1().run());
-    }
-    
-    /**
-     * @title checks whether the correct int value is returned.
-     */
-    public void testN2() {
-        assertEquals(1234, new T2().run(1234));
-    }
-    
-    /**
-     * @title tests whether the correct int value is set.
-     */
-    public void testN3() {
-        T3 t = new T3();
-        t.run(1234);
-        assertEquals(1234, t.i1);
-    }
-
-    /**
-     * @title tests correct setting of field values
-     */
-    public void testN4() {
-        T4 t = new T4();
-        t.run(1234);
-        assertEquals(50000000000l, t.j1);
-        assertEquals(1234, t.i1);
-    }
-
-    
-    
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T1.j b/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T1.j
deleted file mode 100644
index 46eb6b8..0000000
--- a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T1.j
+++ /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 T1.java
-.class public dxc/junit/argsreturns/pargsreturn/jm/T1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-    sipush 1234
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T1.java b/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T1.java
deleted file mode 100644
index 196ae8d..0000000
--- a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T1.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 dxc.junit.argsreturns.pargsreturn.jm;
-
-public class T1 {
-    public int run() {
-        return 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T2.j b/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T2.j
deleted file mode 100644
index 141877c..0000000
--- a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T2.j
+++ /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 T2.java
-.class public dxc/junit/argsreturns/pargsreturn/jm/T2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T2.java b/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T2.java
deleted file mode 100644
index b89bfd3..0000000
--- a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T2.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 dxc.junit.argsreturns.pargsreturn.jm;
-
-public class T2 {
-    public int run(int i) {
-        return i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T3.j b/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T3.j
deleted file mode 100644
index d4ead13..0000000
--- a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T3.java
-.class public dxc/junit/argsreturns/pargsreturn/jm/T3
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)V
-    .limit stack 2
-    .limit locals 2
-    aload_0
-    iload_1
-    putfield dxc.junit.argsreturns.pargsreturn.jm.T3.i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T3.java b/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T3.java
deleted file mode 100644
index e50f39e..0000000
--- a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T3.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 dxc.junit.argsreturns.pargsreturn.jm;
-
-public class T3 {
-    public int i1;
-    
-    public void run(int i) {
-        i1 = i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T4.j b/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T4.j
deleted file mode 100644
index 1b294c6..0000000
--- a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T4.j
+++ /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 T4.java
-.class public dxc/junit/argsreturns/pargsreturn/jm/T4
-.super java/lang/Object
-
-.field public i1 I
-.field public j1 J
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)V
-    .limit stack 3
-    .limit locals 2
-    aload_0
-    iload_1
-    putfield dxc.junit.argsreturns.pargsreturn.jm.T4.i1 I
-
-    aload_0
-    ldc2_w 50000000000
-    putfield dxc.junit.argsreturns.pargsreturn.jm.T4.j1 J
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T4.java b/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T4.java
deleted file mode 100644
index bb8da48..0000000
--- a/tools/dx-tests/src/dxc/junit/argsreturns/pargsreturn/jm/T4.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 dxc.junit.argsreturns.pargsreturn.jm;
-
-public class T4 {
-    public int i1;
-    public long j1;
-    
-    public void run(int i) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/AllTests.java b/tools/dx-tests/src/dxc/junit/opcodes/AllTests.java
deleted file mode 100644
index 2c49ccc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/AllTests.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.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 java vm opcodes");
-        suite.addTestSuite(dxc.junit.opcodes.aaload.Test_aaload.class);
-        suite.addTestSuite(dxc.junit.opcodes.aastore.Test_aastore.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.aconst_null.Test_aconst_null.class);
-        suite.addTestSuite(dxc.junit.opcodes.aload.Test_aload.class);
-        suite.addTestSuite(dxc.junit.opcodes.aload_0.Test_aload_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.aload_1.Test_aload_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.aload_2.Test_aload_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.aload_3.Test_aload_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.anewarray.Test_anewarray.class);
-        suite.addTestSuite(dxc.junit.opcodes.areturn.Test_areturn.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.arraylength.Test_arraylength.class);
-        suite.addTestSuite(dxc.junit.opcodes.astore.Test_astore.class);
-        suite.addTestSuite(dxc.junit.opcodes.astore_0.Test_astore_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.astore_1.Test_astore_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.astore_2.Test_astore_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.astore_3.Test_astore_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.athrow.Test_athrow.class);
-        suite.addTestSuite(dxc.junit.opcodes.baload.Test_baload.class);
-        suite.addTestSuite(dxc.junit.opcodes.bastore.Test_bastore.class);
-        suite.addTestSuite(dxc.junit.opcodes.bipush.Test_bipush.class);
-        suite.addTestSuite(dxc.junit.opcodes.caload.Test_caload.class);
-        suite.addTestSuite(dxc.junit.opcodes.castore.Test_castore.class);
-        suite.addTestSuite(dxc.junit.opcodes.checkcast.Test_checkcast.class);
-        suite.addTestSuite(dxc.junit.opcodes.d2f.Test_d2f.class);
-        suite.addTestSuite(dxc.junit.opcodes.d2i.Test_d2i.class);
-        suite.addTestSuite(dxc.junit.opcodes.d2l.Test_d2l.class);
-        suite.addTestSuite(dxc.junit.opcodes.dadd.Test_dadd.class);
-        suite.addTestSuite(dxc.junit.opcodes.daload.Test_daload.class);
-        suite.addTestSuite(dxc.junit.opcodes.dastore.Test_dastore.class);
-        suite.addTestSuite(dxc.junit.opcodes.dcmpg.Test_dcmpg.class);
-        suite.addTestSuite(dxc.junit.opcodes.dcmpl.Test_dcmpl.class);
-        suite.addTestSuite(dxc.junit.opcodes.dconst_0.Test_dconst_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.dconst_1.Test_dconst_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.ddiv.Test_ddiv.class);
-        suite.addTestSuite(dxc.junit.opcodes.dload.Test_dload.class);
-        suite.addTestSuite(dxc.junit.opcodes.dload_0.Test_dload_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.dload_1.Test_dload_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.dload_2.Test_dload_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.dload_3.Test_dload_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.dmul.Test_dmul.class);
-        suite.addTestSuite(dxc.junit.opcodes.dneg.Test_dneg.class);
-        suite.addTestSuite(dxc.junit.opcodes.drem.Test_drem.class);
-        suite.addTestSuite(dxc.junit.opcodes.dreturn.Test_dreturn.class);
-        suite.addTestSuite(dxc.junit.opcodes.dstore.Test_dstore.class);
-        suite.addTestSuite(dxc.junit.opcodes.dstore_0.Test_dstore_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.dstore_1.Test_dstore_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.dstore_2.Test_dstore_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.dstore_3.Test_dstore_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.dsub.Test_dsub.class);
-        suite.addTestSuite(dxc.junit.opcodes.dup.Test_dup.class);
-        suite.addTestSuite(dxc.junit.opcodes.dup_x1.Test_dup_x1.class);
-        suite.addTestSuite(dxc.junit.opcodes.dup_x2.Test_dup_x2.class);
-        suite.addTestSuite(dxc.junit.opcodes.dup2.Test_dup2.class);
-        suite.addTestSuite(dxc.junit.opcodes.dup2_x1.Test_dup2_x1.class);
-        suite.addTestSuite(dxc.junit.opcodes.dup2_x2.Test_dup2_x2.class);
-        suite.addTestSuite(dxc.junit.opcodes.f2d.Test_f2d.class);
-        suite.addTestSuite(dxc.junit.opcodes.f2i.Test_f2i.class);
-        suite.addTestSuite(dxc.junit.opcodes.f2l.Test_f2l.class);
-        suite.addTestSuite(dxc.junit.opcodes.fadd.Test_fadd.class);
-        suite.addTestSuite(dxc.junit.opcodes.faload.Test_faload.class);
-        suite.addTestSuite(dxc.junit.opcodes.fastore.Test_fastore.class);
-        suite.addTestSuite(dxc.junit.opcodes.fcmpg.Test_fcmpg.class);
-        suite.addTestSuite(dxc.junit.opcodes.fcmpl.Test_fcmpl.class);
-        suite.addTestSuite(dxc.junit.opcodes.fconst_0.Test_fconst_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.fconst_1.Test_fconst_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.fconst_2.Test_fconst_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.fdiv.Test_fdiv.class);
-        suite.addTestSuite(dxc.junit.opcodes.fload.Test_fload.class);
-        suite.addTestSuite(dxc.junit.opcodes.fload_0.Test_fload_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.fload_1.Test_fload_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.fload_2.Test_fload_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.fload_3.Test_fload_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.fmul.Test_fmul.class);
-        suite.addTestSuite(dxc.junit.opcodes.fneg.Test_fneg.class);
-        suite.addTestSuite(dxc.junit.opcodes.frem.Test_frem.class);
-        suite.addTestSuite(dxc.junit.opcodes.freturn.Test_freturn.class);
-        suite.addTestSuite(dxc.junit.opcodes.fstore.Test_fstore.class);
-        suite.addTestSuite(dxc.junit.opcodes.fstore_0.Test_fstore_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.fstore_1.Test_fstore_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.fstore_2.Test_fstore_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.fstore_3.Test_fstore_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.fsub.Test_fsub.class);
-        suite.addTestSuite(dxc.junit.opcodes.getfield.Test_getfield.class);
-        suite.addTestSuite(dxc.junit.opcodes.getstatic.Test_getstatic.class);
-        suite.addTestSuite(dxc.junit.opcodes.opc_goto.Test_opc_goto.class);
-        suite.addTestSuite(dxc.junit.opcodes.goto_w.Test_goto_w.class);
-        suite.addTestSuite(dxc.junit.opcodes.i2b.Test_i2b.class);
-        suite.addTestSuite(dxc.junit.opcodes.i2c.Test_i2c.class);
-        suite.addTestSuite(dxc.junit.opcodes.i2d.Test_i2d.class);
-        suite.addTestSuite(dxc.junit.opcodes.i2f.Test_i2f.class);
-        suite.addTestSuite(dxc.junit.opcodes.i2l.Test_i2l.class);
-        suite.addTestSuite(dxc.junit.opcodes.i2s.Test_i2s.class);
-        suite.addTestSuite(dxc.junit.opcodes.iaload.Test_iaload.class);
-        suite.addTestSuite(dxc.junit.opcodes.iadd.Test_iadd.class);
-        suite.addTestSuite(dxc.junit.opcodes.iand.Test_iand.class);
-        suite.addTestSuite(dxc.junit.opcodes.iastore.Test_iastore.class);
-        suite.addTestSuite(dxc.junit.opcodes.iconst_m1.Test_iconst_m1.class);
-        suite.addTestSuite(dxc.junit.opcodes.iconst_0.Test_iconst_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.iconst_1.Test_iconst_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.iconst_2.Test_iconst_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.iconst_3.Test_iconst_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.iconst_4.Test_iconst_4.class);
-        suite.addTestSuite(dxc.junit.opcodes.iconst_5.Test_iconst_5.class);
-        suite.addTestSuite(dxc.junit.opcodes.idiv.Test_idiv.class);
-        suite.addTestSuite(dxc.junit.opcodes.if_acmpeq.Test_if_acmpeq.class);
-        suite.addTestSuite(dxc.junit.opcodes.if_acmpne.Test_if_acmpne.class);
-        suite.addTestSuite(dxc.junit.opcodes.if_icmpeq.Test_if_icmpeq.class);
-        suite.addTestSuite(dxc.junit.opcodes.if_icmpge.Test_if_icmpge.class);
-        suite.addTestSuite(dxc.junit.opcodes.if_icmpgt.Test_if_icmpgt.class);
-        suite.addTestSuite(dxc.junit.opcodes.if_icmple.Test_if_icmple.class);
-        suite.addTestSuite(dxc.junit.opcodes.if_icmplt.Test_if_icmplt.class);
-        suite.addTestSuite(dxc.junit.opcodes.if_icmpne.Test_if_icmpne.class);
-        suite.addTestSuite(dxc.junit.opcodes.ifeq.Test_ifeq.class);
-        suite.addTestSuite(dxc.junit.opcodes.ifge.Test_ifge.class);
-        suite.addTestSuite(dxc.junit.opcodes.ifgt.Test_ifgt.class);
-        suite.addTestSuite(dxc.junit.opcodes.ifle.Test_ifle.class);
-        suite.addTestSuite(dxc.junit.opcodes.iflt.Test_iflt.class);
-        suite.addTestSuite(dxc.junit.opcodes.ifne.Test_ifne.class);
-        suite.addTestSuite(dxc.junit.opcodes.ifnonnull.Test_ifnonnull.class);
-        suite.addTestSuite(dxc.junit.opcodes.ifnull.Test_ifnull.class);
-        suite.addTestSuite(dxc.junit.opcodes.iinc.Test_iinc.class);
-        suite.addTestSuite(dxc.junit.opcodes.iload.Test_iload.class);
-        suite.addTestSuite(dxc.junit.opcodes.iload_0.Test_iload_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.iload_1.Test_iload_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.iload_2.Test_iload_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.iload_3.Test_iload_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.imul.Test_imul.class);
-        suite.addTestSuite(dxc.junit.opcodes.ineg.Test_ineg.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.opc_instanceof.Test_opc_instanceof.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.invokeinterface.Test_invokeinterface.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.invokespecial.Test_invokespecial.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.invokestatic.Test_invokestatic.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.invokevirtual.Test_invokevirtual.class);
-        suite.addTestSuite(dxc.junit.opcodes.ior.Test_ior.class);
-        suite.addTestSuite(dxc.junit.opcodes.irem.Test_irem.class);
-        suite.addTestSuite(dxc.junit.opcodes.ireturn.Test_ireturn.class);
-        suite.addTestSuite(dxc.junit.opcodes.ishl.Test_ishl.class);
-        suite.addTestSuite(dxc.junit.opcodes.ishr.Test_ishr.class);
-        suite.addTestSuite(dxc.junit.opcodes.istore.Test_istore.class);
-        suite.addTestSuite(dxc.junit.opcodes.istore_0.Test_istore_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.istore_1.Test_istore_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.istore_2.Test_istore_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.istore_3.Test_istore_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.isub.Test_isub.class);
-        suite.addTestSuite(dxc.junit.opcodes.iushr.Test_iushr.class);
-        suite.addTestSuite(dxc.junit.opcodes.ixor.Test_ixor.class);
-        suite.addTestSuite(dxc.junit.opcodes.jsr.Test_jsr.class);
-        suite.addTestSuite(dxc.junit.opcodes.jsr_w.Test_jsr_w.class);
-        suite.addTestSuite(dxc.junit.opcodes.l2d.Test_l2d.class);
-        suite.addTestSuite(dxc.junit.opcodes.l2f.Test_l2f.class);
-        suite.addTestSuite(dxc.junit.opcodes.l2i.Test_l2i.class);
-        suite.addTestSuite(dxc.junit.opcodes.ladd.Test_ladd.class);
-        suite.addTestSuite(dxc.junit.opcodes.laload.Test_laload.class);
-        suite.addTestSuite(dxc.junit.opcodes.land.Test_land.class);
-        suite.addTestSuite(dxc.junit.opcodes.lastore.Test_lastore.class);
-        suite.addTestSuite(dxc.junit.opcodes.lcmp.Test_lcmp.class);
-        suite.addTestSuite(dxc.junit.opcodes.lconst_0.Test_lconst_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.lconst_1.Test_lconst_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.ldc.Test_ldc.class);
-        suite.addTestSuite(dxc.junit.opcodes.ldc_w.Test_ldc_w.class);
-        suite.addTestSuite(dxc.junit.opcodes.ldc2_w.Test_ldc2_w.class);
-        suite.addTestSuite(dxc.junit.opcodes.ldiv.Test_ldiv.class);
-        suite.addTestSuite(dxc.junit.opcodes.lload.Test_lload.class);
-        suite.addTestSuite(dxc.junit.opcodes.lload_0.Test_lload_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.lload_1.Test_lload_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.lload_2.Test_lload_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.lload_3.Test_lload_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.lmul.Test_lmul.class);
-        suite.addTestSuite(dxc.junit.opcodes.lneg.Test_lneg.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.lookupswitch.Test_lookupswitch.class);
-        suite.addTestSuite(dxc.junit.opcodes.lor.Test_lor.class);
-        suite.addTestSuite(dxc.junit.opcodes.lrem.Test_lrem.class);
-        suite.addTestSuite(dxc.junit.opcodes.lreturn.Test_lreturn.class);
-        suite.addTestSuite(dxc.junit.opcodes.lshl.Test_lshl.class);
-        suite.addTestSuite(dxc.junit.opcodes.lshr.Test_lshr.class);
-        suite.addTestSuite(dxc.junit.opcodes.lstore.Test_lstore.class);
-        suite.addTestSuite(dxc.junit.opcodes.lstore_0.Test_lstore_0.class);
-        suite.addTestSuite(dxc.junit.opcodes.lstore_1.Test_lstore_1.class);
-        suite.addTestSuite(dxc.junit.opcodes.lstore_2.Test_lstore_2.class);
-        suite.addTestSuite(dxc.junit.opcodes.lstore_3.Test_lstore_3.class);
-        suite.addTestSuite(dxc.junit.opcodes.lsub.Test_lsub.class);
-        suite.addTestSuite(dxc.junit.opcodes.lushr.Test_lushr.class);
-        suite.addTestSuite(dxc.junit.opcodes.lxor.Test_lxor.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.monitorenter.Test_monitorenter.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.monitorexit.Test_monitorexit.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.multianewarray.Test_multianewarray.class);
-        suite.addTestSuite(dxc.junit.opcodes.opc_new.Test_opc_new.class);
-        suite.addTestSuite(dxc.junit.opcodes.newarray.Test_newarray.class);
-        suite.addTestSuite(dxc.junit.opcodes.nop.Test_nop.class);
-        suite.addTestSuite(dxc.junit.opcodes.pop.Test_pop.class);
-        suite.addTestSuite(dxc.junit.opcodes.pop2.Test_pop2.class);
-        suite.addTestSuite(dxc.junit.opcodes.putfield.Test_putfield.class);
-        suite.addTestSuite(dxc.junit.opcodes.putstatic.Test_putstatic.class);
-        suite.addTestSuite(dxc.junit.opcodes.ret.Test_ret.class);
-        suite.addTestSuite(dxc.junit.opcodes.opc_return.Test_opc_return.class);
-        suite.addTestSuite(dxc.junit.opcodes.saload.Test_saload.class);
-        suite.addTestSuite(dxc.junit.opcodes.sastore.Test_sastore.class);
-        suite.addTestSuite(dxc.junit.opcodes.sipush.Test_sipush.class);
-        suite.addTestSuite(dxc.junit.opcodes.swap.Test_swap.class);
-        suite
-                .addTestSuite(dxc.junit.opcodes.tableswitch.Test_tableswitch.class);
-        suite.addTestSuite(dxc.junit.opcodes.wide.Test_wide.class);
-
-        return suite;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/Test_aaload.java b/tools/dx-tests/src/dxc/junit/opcodes/aaload/Test_aaload.java
deleted file mode 100644
index eebfa92..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/Test_aaload.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 dxc.junit.opcodes.aaload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.aaload.jm.T_aaload_1;
-
-public class Test_aaload extends DxTestCase {
-
-    /**
-     * @title Normal test. Trying different indexes 
-     */
-    public void testN1() {
-        T_aaload_1 t = new T_aaload_1();
-        String[] arr = new String[] {"a", "b"};
-        assertEquals("a", t.run(arr, 0));
-    }
-
-    /**
-     * @title Normal test. Trying different indexes
-     */
-    public void testN2() {
-        T_aaload_1 t = new T_aaload_1();
-        String[] arr = new String[] {"a", "b"};
-        assertEquals("b", t.run(arr, 1));
-    }
-
-    /**
-     * @title ArrayIndexOutOfBoundsException expected
-     */
-    public void testE1() {
-        T_aaload_1 t = new T_aaload_1();
-        String[] arr = new String[] {"a", "b"};
-        try {
-            t.run(arr, 2);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aioobe) {
-            // expected
-        }
-    }
-
-    /**
-     * @title Negative index. ArrayIndexOutOfBoundsException expected
-     */
-    public void testE2() {
-        T_aaload_1 t = new T_aaload_1();
-        String[] arr = new String[] {"a", "b"};
-        try {
-            t.run(arr, -1);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aioobe) {
-            // expected
-        }
-    }
-
-    /**
-     * @title NullPointerException expected
-     */
-    public void testE3() {
-        T_aaload_1 t = new T_aaload_1();
-        String[] arr = null;
-        try {
-            t.run(arr, 0);
-            fail("expected NullPointerException");
-        } catch (NullPointerException npe) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.aaload.jm.T_aaload_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.aaload.jm.T_aaload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.aaload.jm.T_aaload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.aaload.jm.T_aaload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - Object, int
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.aaload.jm.T_aaload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float[], int
-     */
-    public void testVFE6() {
-        try { // opcodes.aastore.jm
-            Class.forName("dxc.junit.opcodes.aaload.jm.T_aaload_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.aaload.jm.T_aaload_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.aaload.jm.T_aaload_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_1.j
deleted file mode 100644
index 90ecad7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_1.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aaload_1.java
-.class public dxc/junit/opcodes/aaload/jm/T_aaload_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([Ljava/lang/String;I)Ljava/lang/String;
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    aaload
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_1.java
deleted file mode 100644
index 8cdd527..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_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 dxc.junit.opcodes.aaload.jm;
-
-public class T_aaload_1 {
-    
-    public String run(String [] arr, int idx) {
-        return arr[idx];
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_2.j
deleted file mode 100644
index 6f906b0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aaload_2.java
-.class public dxc/junit/opcodes/aaload/jm/T_aaload_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([Ljava/lang/String;I)Ljava/lang/String;
-    .limit stack 2
-    .limit locals 3
-
-;    aload_1
-    iload_2
-    aaload
-
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_2.java
deleted file mode 100644
index 55c8238..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_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 dxc.junit.opcodes.aaload.jm;
-
-public class T_aaload_2 {
-    
-    public String run(String [] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_3.j
deleted file mode 100644
index 370de70..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aaload_3.java
-.class public dxc/junit/opcodes/aaload/jm/T_aaload_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([Ljava/lang/String;I)Ljava/lang/String;
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-;    iload_2
-    aaload
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_3.java
deleted file mode 100644
index 0afdc21..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_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 dxc.junit.opcodes.aaload.jm;
-
-public class T_aaload_3 {
-    
-    public String run(String [] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_4.j
deleted file mode 100644
index 94d7275..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_4.j
+++ /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_aaload_4.java
-.class public dxc/junit/opcodes/aaload/jm/T_aaload_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([Ljava/lang/String;D)Ljava/lang/String;
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    dload_2
-    aaload
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_4.java
deleted file mode 100644
index 4505b73..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_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 dxc.junit.opcodes.aaload.jm;
-
-public class T_aaload_4 {
-    
-    public String run(String [] arr, double idx) {
-        return arr[(int)idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_5.j
deleted file mode 100644
index a34bcdc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_5.j
+++ /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_aaload_5.java
-.class public dxc/junit/opcodes/aaload/jm/T_aaload_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([Ljava/lang/String;J)Ljava/lang/String;
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    lload_2
-    aaload
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_5.java
deleted file mode 100644
index 33b3896..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_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 dxc.junit.opcodes.aaload.jm;
-
-public class T_aaload_5 {
-    
-    public String run(String [] arr, long idx) {
-        return arr[(int)idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_6.j
deleted file mode 100644
index e4dbc17..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aaload_6.java
-.class public dxc/junit/opcodes/aaload/jm/T_aaload_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;[Ljava/lang/String;I)Ljava/lang/String;
-    .limit stack 2
-    .limit locals 4
-
-    aload_1
-    iload_3
-    aaload
-
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_6.java
deleted file mode 100644
index 35c428f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_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 dxc.junit.opcodes.aaload.jm;
-
-public class T_aaload_6 {
-    
-    public String run(Object a, String[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_7.j b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_7.j
deleted file mode 100644
index 86a256d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aaload_7.java
-.class public dxc/junit/opcodes/aaload/jm/T_aaload_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([F[Ljava/lang/String;I)Ljava/lang/String;
-    .limit stack 2
-    .limit locals 4
-
-    aload_1
-    iload_3
-    aaload
-
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_7.java b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_7.java
deleted file mode 100644
index 4456205..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_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 dxc.junit.opcodes.aaload.jm;
-
-public class T_aaload_7 {
-    
-    public String run(float[] a, String[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_8.j b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_8.j
deleted file mode 100644
index 5cd99ef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_8.j
+++ /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_aaload_8.java
-.class public dxc/junit/opcodes/aaload/jm/T_aaload_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([J[Ljava/lang/String;I)Ljava/lang/String;
-    .limit stack 2
-    .limit locals 4
-
-    aload_1
-    iload_3
-    aaload
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_8.java b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_8.java
deleted file mode 100644
index 1888233..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_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 dxc.junit.opcodes.aaload.jm;
-
-public class T_aaload_8 {
-    
-    public String run(long[] a, String[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_9.j b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_9.j
deleted file mode 100644
index 27de7bc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_9.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aaload_9.java
-.class public dxc/junit/opcodes/aaload/jm/T_aaload_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([Ljava/lang/String;I)Ljava/lang/String;
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    aload_0
-    aaload
-
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_9.java b/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_9.java
deleted file mode 100644
index 33c3824..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aaload/jm/T_aaload_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 dxc.junit.opcodes.aaload.jm;
-
-public class T_aaload_9 {
-    
-    public String run(String [] arr, int idx) {
-        return arr[idx];
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/Test_aastore.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/Test_aastore.java
deleted file mode 100644
index 419c7b0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/Test_aastore.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.aastore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.aastore.jm.T_aastore_1;
-import dxc.junit.opcodes.aastore.jm.T_aastore_10;
-import dxc.junit.opcodes.aastore.jm.T_aastore_11;
-import dxc.junit.opcodes.aastore.jm.T_aastore_4;
-
-public class Test_aastore extends DxTestCase {
-
-    /**
-     * @title Normal test. Trying different indexes 
-     */
-    public void testN1() {
-        T_aastore_1 t = new T_aastore_1();
-        String[] arr = new String[2];
-        t.run(arr, 0, "hello");
-        assertEquals("hello", arr[0]);
-    }
-
-    /**
-     * @title Normal test. Trying different indexes 
-     */
-    public void testN2() {
-        T_aastore_1 t = new T_aastore_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 Normal test. Trying different indexes 
-     */
-    public void testN3() {
-        T_aastore_10 t = new T_aastore_10();
-        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() {
-        // @uses dxc.junit.opcodes.aastore.jm.SubClass
-        // @uses dxc.junit.opcodes.aastore.jm.SuperClass
-        // @uses dxc.junit.opcodes.aastore.jm.SuperInterface
-        // @uses dxc.junit.opcodes.aastore.jm.SuperInterface2
-        T_aastore_11 t = new T_aastore_11();
-        assertEquals(3, t.run());
-
-    }
-
-    /**
-     * @title ArrayIndexOutOfBoundsException expected
-     */
-    public void testE1() {
-        T_aastore_1 t = new T_aastore_1();
-        String[] arr = new String[2];
-        try {
-            t.run(arr, arr.length, "abc");
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE2() {
-        T_aastore_1 t = new T_aastore_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_aastore_1 t = new T_aastore_1();
-        String[] arr = null;
-        try {
-            t.run(arr, 0, "abc");
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayStoreException
-     */
-    public void testE4() {
-        T_aastore_4 t = new T_aastore_4();
-        String[] arr = new String[2];
-        try {
-            t.run(arr, 0, this);
-            fail("expected ArrayStoreException");
-        } catch (ArrayStoreException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.aastore.jm.T_aastore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.aastore.jm.T_aastore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double, String
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.aastore.jm.T_aastore_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, int, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.aastore.jm.T_aastore_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - object, int, String
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.aastore.jm.T_aastore_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float[], int, String
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.aastore.jm.T_aastore_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int, String
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.aastore.jm.T_aastore_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference, String
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.aastore.jm.T_aastore_12");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_1.j
deleted file mode 100644
index abbd91c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aastore_1.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([Ljava/lang/String;ILjava/lang/String;)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    aload_3
-    aastore
-
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_1.java
deleted file mode 100644
index bea5c19..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_1 {
-
-    public void run(String[] arr, int idx, String value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_10.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_10.j
deleted file mode 100644
index 1dbfb4b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_10.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aastore_10.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_10
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([Ljava/lang/Integer;ILjava/lang/Integer;)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    aload_3
-    aastore
-
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_10.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_10.java
deleted file mode 100644
index f94c166..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_10 {
-    
-    public void run(Integer[] arr, int idx, Integer value) {
-        arr[idx] = value;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_11.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_11.j
deleted file mode 100644
index 278f7f0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_11.j
+++ /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 T_aastore_11.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 20
-    .limit locals 10
-    
-    iconst_0
-    istore_1
-
-    iconst_1
-    anewarray dxc/junit/opcodes/aastore/jm/SubClass
-    astore_2    ; SubClass[]
-    
-    iconst_1
-    anewarray dxc/junit/opcodes/aastore/jm/SuperClass
-    astore_3    ; SuperClass[]
-    
-    new        dxc/junit/opcodes/aastore/jm/SubClass
-    dup
-    invokespecial dxc/junit/opcodes/aastore/jm/SubClass.<init>()V
-    astore 4    ; SubClass
-    
-    new        dxc/junit/opcodes/aastore/jm/SuperClass
-    dup
-    invokespecial dxc/junit/opcodes/aastore/jm/SuperClass.<init>()V
-    astore 5    ; SuperClass
-    
-    iconst_1
-    anewarray dxc/junit/opcodes/aastore/jm/SuperInterface
-    astore 6    ; SuperInterface[]
-    
-    iconst_1
-    anewarray java/lang/Object
-    astore 7    ; Object[]
-    
-    iconst_1
-    anewarray dxc/junit/opcodes/aastore/jm/SuperInterface2
-    astore 8    ; SuperInterface2[]    
-    
-; (SubClass -> SuperClass[])
-    aload 3
-    iconst_0
-    aload 4
-    aastore
-    
-; (SubClass -> SuperInterface[])
-    aload 6
-    iconst_0
-    aload 4
-    aastore
-    
-; (SubClass -> Object[])
-    aload 7
-    iconst_0
-    aload 4
-    aastore        
-        
-; !(SuperClass -> SubClass[])    
-Label1:
-    aload 2
-    iconst_0
-    aload 5
-Label10:        
-    nop
-    aastore
-Label11:    
-    goto Label2
-Label12:
-    pop
-    iinc 1 1
-    goto Label2
-        
-; !(SuperClass -> SuperInterface2[])    
-Label2:
-    aload 8
-    iconst_0
-    aload 5
-Label20:    
-    aastore
-Label21:    
-    goto Label3
-Label22:
-    pop
-    iinc 1 1
-    goto Label3
-
-; !(SubClass[] -> SuperInterface[])    
-Label3:
-    aload 6
-    iconst_0
-    aload 2
-Label30:    
-    aastore
-Label31:    
-    goto Label4
-Label32:    
-    pop
-    iinc 1 1
-    goto Label4
-
-Label4:
-Label6:        
-    iload_1
-    ireturn
-    
-.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/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_11.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_11.java
deleted file mode 100644
index ad0c222..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_11 {
-    
-    public int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_12.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_12.j
deleted file mode 100644
index ee00a4a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_12.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aastore_12.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_12
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([Ljava/lang/String;ILjava/lang/String;)V
-    .limit stack 3
-    .limit locals 4
-    
-    aload_1
-    aload_0
-    aload_3
-    aastore
-
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_12.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_12.java
deleted file mode 100644
index c2b1c75..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_12 {
-    
-    public void run(String[] arr, int idx, String value) {
-        arr[idx] = value;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_2.j
deleted file mode 100644
index 2c9d227..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_2.j
+++ /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_aastore_2.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([Ljava/lang/String;ILjava/lang/String;)V
-    .limit stack 3
-    .limit locals 4
-
-;    aload_1
-    iload_2
-    aload_3
-    aastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_2.java
deleted file mode 100644
index 39b0b09..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_2 {
-
-    public void run(String[] arr, int idx, String value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_3.j
deleted file mode 100644
index 531ab76..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_3.j
+++ /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_aastore_3.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([Ljava/lang/String;ILjava/lang/String;)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-;    aload_3
-    aastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_3.java
deleted file mode 100644
index 2f77f61..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_3 {
-
-    public void run(String[] arr, int idx, String value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_4.j
deleted file mode 100644
index 38b89e8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_4.j
+++ /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_aastore_4.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([Ljava/lang/String;ILjava/lang/Object;)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    aload_3
-    aastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_4.java
deleted file mode 100644
index 3c6f558..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_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/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_5.j
deleted file mode 100644
index 89e70cc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_5.j
+++ /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_aastore_5.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([Ljava/lang/String;DLjava/lang/String;)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-    aload 4
-    aastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_5.java
deleted file mode 100644
index d063623..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_5 {
-
-    public void run(String[] arr, double idx, String value) {
-        arr[(int)idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_6.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_6.j
deleted file mode 100644
index 1e5e7ce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_6.j
+++ /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_aastore_6.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([Ljava/lang/String;IJ)V
-    .limit stack 4
-    .limit locals 5
-    
-    aload_1
-    iload_2
-    lload_3
-    aastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_6.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_6.java
deleted file mode 100644
index 449f21c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_6 {
-
-    public void run(String[] arr, int idx, String value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_7.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_7.j
deleted file mode 100644
index b89c42f8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_7.j
+++ /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_aastore_7.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_7
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ljava/lang/Object;ILjava/lang/String;)V
-    .limit stack 3
-    .limit locals 5
-
-    aload_1
-    iload_2
-    aload 3
-    aastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_7.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_7.java
deleted file mode 100644
index 082f5c2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_7 {
-    
-    public void run(Object a, String[] arr, int idx, String value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_8.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_8.j
deleted file mode 100644
index d6fc147..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_8.j
+++ /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_aastore_8.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([FILjava/lang/String;)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_2
-    aload 3
-    aastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_8.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_8.java
deleted file mode 100644
index ef57088..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_8 {
-    
-    public void run(String a[], float[] arr, int idx, String value) {
-        a[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_9.j b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_9.j
deleted file mode 100644
index 83d163f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_9.j
+++ /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_aastore_9.java
-.class public dxc/junit/opcodes/aastore/jm/T_aastore_9
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([JILjava/lang/String;)V
-    .limit stack 3
-    .limit locals 5
-
-    aload_1
-    iload_2
-    aload 3
-    aastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_9.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_9.java
deleted file mode 100644
index f5713a0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/T_aastore_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 dxc.junit.opcodes.aastore.jm;
-
-public class T_aastore_9 {
-    
-    public void run(String a[], long[] arr, int idx, String value) {
-        a[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/TestStubs.java
deleted file mode 100644
index 190220f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aastore/jm/TestStubs.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 dxc.junit.opcodes.aastore.jm;
-
-
-interface SuperInterface{
-    
-}
-
-interface SuperInterface2{
-    
-}
-
-class SuperClass implements SuperInterface{
-    
-}
-
-class SubClass extends SuperClass{
-
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/Test_aconst_null.java b/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/Test_aconst_null.java
deleted file mode 100644
index 531e559..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/Test_aconst_null.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 dxc.junit.opcodes.aconst_null;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.aconst_null.jm.T_aconst_null_1;
-
-public class Test_aconst_null extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        assertEquals(null, new T_aconst_null_1().run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.aconst_null.jm.T_aconst_null_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/jm/T_aconst_null_1.j b/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/jm/T_aconst_null_1.j
deleted file mode 100644
index fe997d2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/jm/T_aconst_null_1.j
+++ /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.
-
-.class public dxc/junit/opcodes/aconst_null/jm/T_aconst_null_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Ljava/lang/Object;
-    .limit stack 1
-    .limit locals 1
-
-    aconst_null
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/jm/T_aconst_null_1.java b/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/jm/T_aconst_null_1.java
deleted file mode 100644
index 0cc8d33..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/jm/T_aconst_null_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 dxc.junit.opcodes.aconst_null.jm;
-
-public class T_aconst_null_1 {
-    public Object run() {
-        return null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/jm/T_aconst_null_2.j b/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/jm/T_aconst_null_2.j
deleted file mode 100644
index 9993f2b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aconst_null/jm/T_aconst_null_2.j
+++ /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.
-
-.class public dxc/junit/opcodes/aconst_null/jm/T_aconst_null_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Ljava/lang/Object;
-    .limit stack 0
-    .limit locals 1
-
-    aconst_null
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/Test_aload.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/Test_aload.java
deleted file mode 100644
index cff192e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/Test_aload.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 dxc.junit.opcodes.aload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.aload.jm.T_aload_1;
-import dxc.junit.opcodes.aload.jm.T_aload_1_w;
-import dxc.junit.opcodes.aload.jm.T_aload_2;
-import dxc.junit.opcodes.aload.jm.T_aload_2_w;
-
-/**
- * NORMAL aload VERSION
- */
-public class Test_aload extends DxTestCase {
-
-    /**
-     * @title  Test aload 1
-     */
-    public void testN1() {
-        T_aload_1 t = new T_aload_1();
-        assertEquals("hello", t.run());
-    }
-
-    /**
-     * @title  Test aload 255
-     */
-    public void testN2() {
-        T_aload_2 t = new T_aload_2();
-        assertEquals("hello", t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.21
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload.jm.T_aload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload.jm.T_aload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload.jm.T_aload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload.jm.T_aload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.21
-     * @title returnAddress may not be loaded from
-     * local variable
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload.jm.T_aload_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE aload VERSION
-     */
-
-    /**
-     * @title  Test aload 257
-     */
-    public void testN3() {
-        T_aload_1_w t = new T_aload_1_w();
-        assertEquals("hello", t.run());
-    }
-
-    /**
-     * @title  Test aload_w 1
-     */
-    public void testN4() {
-        T_aload_2_w t = new T_aload_2_w();
-        assertEquals("hello", t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload.jm.T_aload_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload.jm.T_aload_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload.jm.T_aload_5_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE9() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload.jm.T_aload_6_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.21
-     * @title returnAddress may not be loaded from
-     * local variable
-     */
-    public void testVFE10() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload.jm.T_aload_7_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1.j
deleted file mode 100644
index 8563239..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1.j
+++ /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_aload_1.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 3
-    .limit locals 2
-
-    ldc "hello"
-    astore_1
-    ldc "hi"
-    aload_1
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1.java
deleted file mode 100644
index fb737be..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_1 {
-
-    public String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1_w.j
deleted file mode 100644
index cb90bcb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1_w.j
+++ /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_aload_1_w.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_1_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 3
-    .limit locals 300
-
-    ldc "hello"
-    astore 257
-    ldc "hi"
-    aload 257
-
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1_w.java
deleted file mode 100644
index eee3830..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_1_w.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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_1_w {
-    
-    public String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2.j
deleted file mode 100644
index 2bd7bf4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2.j
+++ /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_aload_2.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 4
-    .limit locals 300
-
-    new java/lang/String
-    dup
-    ldc "hello"
-    astore 255
-    ldc "hi"
-    aload 255
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2.java
deleted file mode 100644
index 23b55e3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_2 {
-
-    public String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2_w.j
deleted file mode 100644
index fb0bb5f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2_w.j
+++ /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_aload_2_w.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_2_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 3
-    .limit locals 2
-
-    ldc "hello"
-    astore_1
-    ldc "hi"
-    aload_w 1
-
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2_w.java
deleted file mode 100644
index 34ae0fd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_2_w.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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_2_w {
-    
-    public String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3.j
deleted file mode 100644
index 0c5d5f2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aload_3.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 1
-
-    aload 1
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3.java
deleted file mode 100644
index e09b3f3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3.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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_3 {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3_w.j
deleted file mode 100644
index 41696c1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aload_3_w.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_3_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 300
-
-    aload 300
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3_w.java
deleted file mode 100644
index 1bda5b3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_3_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.aload.jm;
-
-public class T_aload_3_w {
-    
-    public void run() {
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4.j
deleted file mode 100644
index d14e595..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4.j
+++ /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_aload_4.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    fstore_1
-    fconst_1
-    fstore_2
-    
-    aload 1
-    
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4.java
deleted file mode 100644
index a293d13..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_4 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4_w.j
deleted file mode 100644
index c611274..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4_w.j
+++ /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_aload_4_w.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_4_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 300
-
-    iconst_1
-    istore 260
-    iconst_1
-    istore 261
-    
-    aload_w 260
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4_w.java
deleted file mode 100644
index 17ee8f6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_4_w.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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_4_w {
-    
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5.j
deleted file mode 100644
index c568f54..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5.j
+++ /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_aload_5.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_1
-    
-    aload 1
-    
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5.java
deleted file mode 100644
index 21b90bd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_5 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5_w.j
deleted file mode 100644
index 4c133fc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5_w.j
+++ /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_aload_5_w.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_5_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 300
-
-    dconst_1
-    dstore 260
-    dconst_1
-    dstore 261
-    
-    aload_w 260
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5_w.java
deleted file mode 100644
index 8331d51..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_5_w.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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_5_w {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6.j
deleted file mode 100644
index afbff18..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6.j
+++ /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_aload_6.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 2
-
-    ldc "abc"
-    astore_1
-    
-    aload 1
-    aload 1
-    
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6.java
deleted file mode 100644
index 2a622c0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_6 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6_w.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6_w.j
deleted file mode 100644
index 0e62855..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6_w.j
+++ /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_aload_6_w.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_6_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 300
-
-    ldc "hello"
-    astore 260
-    
-    aload_w 260
-    aload_w 260
-    
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6_w.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6_w.java
deleted file mode 100644
index 38ec788..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_6_w.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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_6_w {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7.j
deleted file mode 100644
index 8aacd2c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7.j
+++ /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_aload_7.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_7
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 2
-
-    jsr Label1
-    return
-
-Label1:
-    astore_1
-    aload 1
-    ret 1
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7.java
deleted file mode 100644
index 2ff26f0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_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 dxc.junit.opcodes.aload.jm;
-
-public class T_aload_7 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7_w.j b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7_w.j
deleted file mode 100644
index 9b7a8e9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7_w.j
+++ /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_aload_7_w.java
-.class public dxc/junit/opcodes/aload/jm/T_aload_7_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 2
-
-    jsr Label1
-    return
-
-Label1:
-    astore_1
-    aload_w 1
-    ret 1
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7_w.java b/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7_w.java
deleted file mode 100644
index 110edd8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload/jm/T_aload_7_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.aload.jm;
-
-public class T_aload_7_w {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/Test_aload_0.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/Test_aload_0.java
deleted file mode 100644
index 457d2ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/Test_aload_0.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.aload_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.aload_0.jm.T_aload_0_1;
-import dxc.junit.opcodes.aload_0.jm.T_aload_0_6;
-
-public class Test_aload_0 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals("hello", T_aload_0_1.run());
-    }
-
-    /**
-     * @title equality of aload_<n> and aload <n>
-     */
-    public void testN2() {
-        assertTrue(T_aload_0_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_0.jm.T_aload_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_0.jm.T_aload_0_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_0.jm.T_aload_0_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_0.jm.T_aload_0_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_0.jm.T_aload_0_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.21
-     * @title returnAddress may not be loaded from
-     * local variable
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_0.jm.T_aload_0_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_1.j
deleted file mode 100644
index 99a6407..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_1.j
+++ /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_aload_0_1.java
-.class public dxc/junit/opcodes/aload_0/jm/T_aload_0_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 3
-    .limit locals 2
-    
-    ldc "hello"
-    astore_0
-    ldc "hi"
-    aload_0
-    areturn
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_1.java
deleted file mode 100644
index cc72d47..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_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 dxc.junit.opcodes.aload_0.jm;
-
-public class T_aload_0_1 {
-
-    public static String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_2.j
deleted file mode 100644
index 0e2b130..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aload_0_2.java
-.class public dxc/junit/opcodes/aload_0/jm/T_aload_0_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 0
-
-    aload_0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_2.java
deleted file mode 100644
index ede0a70..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_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 dxc.junit.opcodes.aload_0.jm;
-
-public class T_aload_0_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_3.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_3.j
deleted file mode 100644
index 681f400..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_3.j
+++ /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_aload_0_3.java
-.class public dxc/junit/opcodes/aload_0/jm/T_aload_0_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    fstore_0
-    fconst_1
-    fstore_1
-    
-    aload_0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_3.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_3.java
deleted file mode 100644
index e9ee293..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_3.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 dxc.junit.opcodes.aload_0.jm;
-
-public class T_aload_0_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_4.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_4.j
deleted file mode 100644
index ea898b3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_4.j
+++ /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_aload_0_4.java
-.class public dxc/junit/opcodes/aload_0/jm/T_aload_0_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_0
-    
-    aload_0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_4.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_4.java
deleted file mode 100644
index c6a30ad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_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 dxc.junit.opcodes.aload_0.jm;
-
-public class T_aload_0_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_5.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_5.j
deleted file mode 100644
index c30867e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_5.j
+++ /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_aload_0_5.java
-.class public dxc/junit/opcodes/aload_0/jm/T_aload_0_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 2
-
-    iconst_1
-    istore_0
-    
-    aload_0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_5.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_5.java
deleted file mode 100644
index c9a12a3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_5.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 dxc.junit.opcodes.aload_0.jm;
-
-public class T_aload_0_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_6.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_6.j
deleted file mode 100644
index 1f823e5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_6.j
+++ /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_aload_0_6.java
-.class public dxc/junit/opcodes/aload_0/jm/T_aload_0_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 2
-
-    ldc "hello"
-    astore_0
-
-    aload_0
-    aload 0
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_6.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_6.java
deleted file mode 100644
index 350126f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_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 dxc.junit.opcodes.aload_0.jm;
-
-public class T_aload_0_6 {
-
-    public static boolean run() {
-        String a = new String("hello");
-        return a == a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_7.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_7.j
deleted file mode 100644
index 8e0073c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_7.j
+++ /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_aload_0_7.java
-.class public dxc/junit/opcodes/aload_0/jm/T_aload_0_7
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    ldc "hello"
-    astore_0
-    
-    aload_0
-    aload_0
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_7.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_7.java
deleted file mode 100644
index 7d002ef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_7.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 dxc.junit.opcodes.aload_0.jm;
-
-public class T_aload_0_7 {
-    
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_8.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_8.j
deleted file mode 100644
index d2922cc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_8.j
+++ /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_aload_0_8.java
-.class public dxc/junit/opcodes/aload_0/jm/T_aload_0_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    jsr Label1
-    return
-
-Label1:
-    astore_0
-    aload_0
-    ret 0
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_8.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_8.java
deleted file mode 100644
index 1e268b9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_0/jm/T_aload_0_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 dxc.junit.opcodes.aload_0.jm;
-
-public class T_aload_0_8 {
-    
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/Test_aload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/Test_aload_1.java
deleted file mode 100644
index 22a129e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/Test_aload_1.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.aload_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.aload_1.jm.T_aload_1_1;
-import dxc.junit.opcodes.aload_1.jm.T_aload_1_6;
-
-public class Test_aload_1 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals("hello", T_aload_1_1.run());
-    }
-
-    /**
-     * @title equality of aload_<n> and aload <n>
-     */
-    public void testN2() {
-        assertTrue(T_aload_1_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_1.jm.T_aload_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_1.jm.T_aload_1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_1.jm.T_aload_1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_1.jm.T_aload_1_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_1.jm.T_aload_1_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.21
-     * @title returnAddress may not be loaded from
-     * local variable
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_1.jm.T_aload_1_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_1.j
deleted file mode 100644
index e2718f5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_1.j
+++ /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_aload_1_1.java
-.class public dxc/junit/opcodes/aload_1/jm/T_aload_1_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 3
-    .limit locals 2
-    
-    ldc "hello"
-    astore_1
-    ldc "hi"
-    aload_1
-    areturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_1.java
deleted file mode 100644
index e5e4fc6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_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 dxc.junit.opcodes.aload_1.jm;
-
-public class T_aload_1_1 {
-
-    public static String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_2.j
deleted file mode 100644
index 8089467..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_2.j
+++ /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_aload_1_2.java
-.class public dxc/junit/opcodes/aload_1/jm/T_aload_1_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 0
-
-    aload_1
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_2.java
deleted file mode 100644
index d223d29..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_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 dxc.junit.opcodes.aload_1.jm;
-
-public class T_aload_1_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_3.j
deleted file mode 100644
index 0d98b4c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_3.j
+++ /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_aload_1_3.java
-.class public dxc/junit/opcodes/aload_1/jm/T_aload_1_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    fstore_0
-    fconst_1
-    fstore_1
-    
-    aload_1
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_3.java
deleted file mode 100644
index e639b3b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_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 dxc.junit.opcodes.aload_1.jm;
-
-public class T_aload_1_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_4.j
deleted file mode 100644
index 037314b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_4.j
+++ /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_aload_1_4.java
-.class public dxc/junit/opcodes/aload_1/jm/T_aload_1_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_1
-    
-    aload_1
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_4.java
deleted file mode 100644
index 4263064..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_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 dxc.junit.opcodes.aload_1.jm;
-
-public class T_aload_1_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_5.j
deleted file mode 100644
index 9e84cc2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_5.j
+++ /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_aload_1_5.java
-.class public dxc/junit/opcodes/aload_1/jm/T_aload_1_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 2
-
-    iconst_1
-    istore_1
-    
-    aload_1
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_5.java
deleted file mode 100644
index 88fb112..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_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 dxc.junit.opcodes.aload_1.jm;
-
-public class T_aload_1_5 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_6.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_6.j
deleted file mode 100644
index 2a476d6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_6.j
+++ /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_aload_1_6.java
-.class public dxc/junit/opcodes/aload_1/jm/T_aload_1_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 2
-
-    ldc "hello"
-    astore_1
-
-    aload_1
-    aload 1
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_6.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_6.java
deleted file mode 100644
index a5b95c3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_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 dxc.junit.opcodes.aload_1.jm;
-
-public class T_aload_1_6 {
-
-    public static boolean run() {
-        String a = new String("hello");
-        return a == a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_7.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_7.j
deleted file mode 100644
index dcc158f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_7.j
+++ /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_aload_1_7.java
-.class public dxc/junit/opcodes/aload_1/jm/T_aload_1_7
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    ldc "hello"
-    astore_1
-    
-    aload_1
-    aload_1
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_7.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_7.java
deleted file mode 100644
index 08930a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_7.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 dxc.junit.opcodes.aload_1.jm;
-
-public class T_aload_1_7 {
-    
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_8.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_8.j
deleted file mode 100644
index a72e6f1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_8.j
+++ /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_aload_1_8.java
-.class public dxc/junit/opcodes/aload_1/jm/T_aload_1_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    jsr Label1
-    return
-
-Label1:
-    astore_1
-    aload_1
-    ret 1
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_8.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_8.java
deleted file mode 100644
index 9fd86cc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_1/jm/T_aload_1_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 dxc.junit.opcodes.aload_1.jm;
-
-public class T_aload_1_8 {
-    
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/Test_aload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/Test_aload_2.java
deleted file mode 100644
index d01c00b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/Test_aload_2.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.aload_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.aload_2.jm.T_aload_2_1;
-import dxc.junit.opcodes.aload_2.jm.T_aload_2_6;
-
-public class Test_aload_2 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals("hello", T_aload_2_1.run());
-    }
-
-    /**
-     * @title equality of aload_<n> and aload <n>
-     */
-    public void testN2() {
-        assertTrue(T_aload_2_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_2.jm.T_aload_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_2.jm.T_aload_2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_2.jm.T_aload_2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_2.jm.T_aload_2_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_2.jm.T_aload_2_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.21
-     * @title returnAddress may not be loaded from
-     * local variable
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_2.jm.T_aload_2_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_1.j
deleted file mode 100644
index cf7efe7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_1.j
+++ /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_aload_2_1.java
-.class public dxc/junit/opcodes/aload_2/jm/T_aload_2_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 3
-    .limit locals 3
-    
-    ldc "hello"
-    astore_2
-    ldc "hi"
-    aload_2
-    areturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_1.java
deleted file mode 100644
index a57be08..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_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 dxc.junit.opcodes.aload_2.jm;
-
-public class T_aload_2_1 {
-
-    public static String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_2.j
deleted file mode 100644
index 12a73ff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_aload_2_2.java
-.class public dxc/junit/opcodes/aload_2/jm/T_aload_2_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    .limit stack 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 0
-
-    aload_2
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_2.java
deleted file mode 100644
index c2b074d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_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 dxc.junit.opcodes.aload_2.jm;
-
-public class T_aload_2_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_3.j
deleted file mode 100644
index 829b23a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_3.j
+++ /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_aload_2_3.java
-.class public dxc/junit/opcodes/aload_2/jm/T_aload_2_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    fstore_1
-    fconst_2
-    fstore_2
-    
-    aload_2
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_3.java
deleted file mode 100644
index 5fe9956..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_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 dxc.junit.opcodes.aload_2.jm;
-
-public class T_aload_2_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_4.j
deleted file mode 100644
index 14565e7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_4.j
+++ /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_aload_2_4.java
-.class public dxc/junit/opcodes/aload_2/jm/T_aload_2_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_2
-    
-    aload_2
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_4.java
deleted file mode 100644
index 604db5a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_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 dxc.junit.opcodes.aload_2.jm;
-
-public class T_aload_2_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_5.j
deleted file mode 100644
index 8d3fd27..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_5.j
+++ /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_aload_2_5.java
-.class public dxc/junit/opcodes/aload_2/jm/T_aload_2_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 4
-
-    iconst_2
-    istore_2
-    
-    aload_2
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_5.java
deleted file mode 100644
index 3a39ef9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_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 dxc.junit.opcodes.aload_2.jm;
-
-public class T_aload_2_5 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_6.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_6.j
deleted file mode 100644
index aa81a91..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_6.j
+++ /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_aload_2_6.java
-.class public dxc/junit/opcodes/aload_2/jm/T_aload_2_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 3
-
-    ldc "hello"
-    astore_2
-
-    aload_2
-    aload 2
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_6.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_6.java
deleted file mode 100644
index a4e9ca0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_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 dxc.junit.opcodes.aload_2.jm;
-
-public class T_aload_2_6 {
-
-    public static boolean run() {
-        String a = new String("hello");
-        return a == a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_7.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_7.j
deleted file mode 100644
index bf69c97..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_7.j
+++ /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_aload_2_7.java
-.class public dxc/junit/opcodes/aload_2/jm/T_aload_2_7
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 3
-
-    ldc "hello"
-    astore_2
-    
-    aload_2
-    aload_2
-    
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_7.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_7.java
deleted file mode 100644
index e9e8773..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_7.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 dxc.junit.opcodes.aload_2.jm;
-
-public class T_aload_2_7 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_8.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_8.j
deleted file mode 100644
index d03eedf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_8.j
+++ /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_aload_2_8.java
-.class public dxc/junit/opcodes/aload_2/jm/T_aload_2_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 3
-
-    jsr Label1
-    return
-
-Label1:
-    astore_2
-    aload_2
-    ret 2
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_8.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_8.java
deleted file mode 100644
index 56e6e7a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_2/jm/T_aload_2_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 dxc.junit.opcodes.aload_2.jm;
-
-public class T_aload_2_8 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/Test_aload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/Test_aload_3.java
deleted file mode 100644
index ee67af0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/Test_aload_3.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.aload_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.aload_3.jm.T_aload_3_1;
-import dxc.junit.opcodes.aload_3.jm.T_aload_3_6;
-
-public class Test_aload_3 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals("hello", T_aload_3_1.run());
-    }
-
-    /**
-     * @title equality of aload_<n> and aload <n>
-     */
-    public void testN2() {
-        assertTrue(T_aload_3_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_3.jm.T_aload_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_3.jm.T_aload_3_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_3.jm.T_aload_3_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_3.jm.T_aload_3_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_3.jm.T_aload_3_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.21
-     * @title returnAddress may not be loaded from
-     * local variable
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.aload_3.jm.T_aload_3_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_1.j
deleted file mode 100644
index 2d79c90..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_1.j
+++ /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_aload_3_1.java
-.class public dxc/junit/opcodes/aload_3/jm/T_aload_3_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 3
-    .limit locals 4
-    
-    ldc "hello"
-    astore_3
-    ldc "hi"
-    aload_3
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_1.java
deleted file mode 100644
index 27b910f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_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 dxc.junit.opcodes.aload_3.jm;
-
-public class T_aload_3_1 {
-
-    public static String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_2.j
deleted file mode 100644
index ed1f591..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_2.j
+++ /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_aload_3_2.java
-.class public dxc/junit/opcodes/aload_3/jm/T_aload_3_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 0
-
-    aload_3
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_2.java
deleted file mode 100644
index 15743fd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_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 dxc.junit.opcodes.aload_3.jm;
-
-public class T_aload_3_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_3.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_3.j
deleted file mode 100644
index 164dc3c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_3.j
+++ /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_aload_3_3.java
-.class public dxc/junit/opcodes/aload_3/jm/T_aload_3_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_2
-    fstore_3
-    
-    aload_3
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_3.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_3.java
deleted file mode 100644
index 90ff938..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_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 dxc.junit.opcodes.aload_3.jm;
-
-public class T_aload_3_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_4.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_4.j
deleted file mode 100644
index d83697a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_4.j
+++ /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_aload_3_4.java
-.class public dxc/junit/opcodes/aload_3/jm/T_aload_3_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    lconst_1
-    lstore_3
-    
-    aload_3
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_4.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_4.java
deleted file mode 100644
index 51b8522..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_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 dxc.junit.opcodes.aload_3.jm;
-
-public class T_aload_3_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_5.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_5.j
deleted file mode 100644
index 2acfe28..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_5.j
+++ /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_aload_3_5.java
-.class public dxc/junit/opcodes/aload_3/jm/T_aload_3_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 4
-
-    iconst_3
-    istore_3
-    
-    aload_3
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_5.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_5.java
deleted file mode 100644
index a2cb2d9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_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 dxc.junit.opcodes.aload_3.jm;
-
-public class T_aload_3_5 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_6.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_6.j
deleted file mode 100644
index 905342a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_6.j
+++ /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_aload_3_6.java
-.class public dxc/junit/opcodes/aload_3/jm/T_aload_3_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 4
-
-    ldc "hello"
-    astore_3
-
-    aload_3
-    aload 3
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_6.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_6.java
deleted file mode 100644
index ce9727b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_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 dxc.junit.opcodes.aload_3.jm;
-
-public class T_aload_3_6 {
-
-    public static boolean run() {
-        String a = new String("hello");
-        return a == a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_7.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_7.j
deleted file mode 100644
index 1083e93..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_7.j
+++ /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_aload_3_7.java
-.class public dxc/junit/opcodes/aload_3/jm/T_aload_3_7
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 4
-
-    ldc "hello"
-    astore_3
-    
-    aload_3
-    aload_3
-    
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_7.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_7.java
deleted file mode 100644
index d8f143f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_7.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 dxc.junit.opcodes.aload_3.jm;
-
-public class T_aload_3_7 {
-    
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_8.j b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_8.j
deleted file mode 100644
index 6699732..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_8.j
+++ /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_aload_3_8.java
-.class public dxc/junit/opcodes/aload_3/jm/T_aload_3_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 4
-
-    jsr Label1
-    return
-
-Label1:
-    astore_3
-    aload_3
-    ret 3
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_8.java b/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_8.java
deleted file mode 100644
index 12628ef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/aload_3/jm/T_aload_3_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 dxc.junit.opcodes.aload_3.jm;
-
-public class T_aload_3_8 {
-    
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/TestStubs.java
deleted file mode 100644
index 08a00cd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/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 dxc.junit.opcodes.anewarray;
-
-public class TestStubs {
-    
-private class TestStub{
-    // testE4
-}
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/Test_anewarray.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/Test_anewarray.java
deleted file mode 100644
index ecc1ce2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/Test_anewarray.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 dxc.junit.opcodes.anewarray;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.anewarray.jm.T_anewarray_1;
-import dxc.junit.opcodes.anewarray.jm.T_anewarray_6;
-import dxc.junit.opcodes.anewarray.jm.T_anewarray_7;
-
-public class Test_anewarray extends DxTestCase {
-    
-    /**
-     * @title Test for Object
-     */
-    public void testN1() {
-        T_anewarray_1 t = new T_anewarray_1();
-
-        Object[] arr = t.run(10);
-        assertNotNull(arr);
-        assertEquals(10, arr.length);
-        for (int i = 0; i < 10; i++)
-            assertNull(arr[i]);
-    }
-
-    /**
-     * @title Test for String
-     */
-    public void testN2() {
-        T_anewarray_1 t = new T_anewarray_1();
-
-        String[] arr2 = t.run2(5);
-        assertNotNull(arr2);
-        assertEquals(5, arr2.length);
-        for (int i = 0; i < 5; i++)
-            assertNull(arr2[i]);
-    }
-
-    /**
-     * @title Test for Integer
-     */
-    public void testN3() {
-        T_anewarray_1 t = new T_anewarray_1();
-
-        Integer[] arr3 = t.run3(15);
-        assertNotNull(arr3);
-        assertEquals(15, arr3.length);
-        for (int i = 0; i < 15; i++)
-            assertNull(arr3[i]);
-    }
-
-    /**
-     * @title if count is zero, no subsequent dimensions allocated
-     */
-    public void testE1() {
-        T_anewarray_1 t = new T_anewarray_1();
-        Object[] res = t.run(0);
-        try {
-            Object s = res[0];
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException ae) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected NegativeArraySizeException
-     */
-    public void testE2() {
-        T_anewarray_1 t = new T_anewarray_1();
-        try {
-            t.run(-2);
-            fail("expected NegativeArraySizeException");
-        } catch (NegativeArraySizeException nase) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected NoClassDefFoundError
-     */
-    public void testE3() {
-        try {
-            T_anewarray_6 t = new T_anewarray_6();
-            t.run();
-            fail("expected NoClassDefFoundError");
-        } catch (NoClassDefFoundError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; eagerly tries to load the array type
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected IllegalAccessError
-     * <pre>
-     * V(15469) +++ dvmAddClassToHash '[Ldxc/junit/opcodes/anewarray/jm/TestStubs$TestStub;' 0x973d7708 (isnew=1) --> 0x973e1f10  (dalvikvm)
-     * V(15469) Created array class '[Ldxc/junit/opcodes/anewarray/jm/TestStubs$TestStub;' 0x973d7708 (access=0x6000.0010)  (dalvikvm)
-     * </pre>
-     * TestStub class is private. no IllegalAccessError is thrown, but VerifyError
-     */
-    public void testE4() {
-        try {
-            T_anewarray_7 t = new T_anewarray_7();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.19
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.anewarray.jm.T_anewarray_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.anewarray.jm.T_anewarray_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.anewarray.jm.T_anewarray_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.17
-     * @title array of more than 255 dimensions
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.anewarray.jm.T_anewarray_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.anewarray.jm.T_anewarray_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.19
-     * @title constant pool type
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.anewarray.jm.T_anewarray_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_1.j b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_1.j
deleted file mode 100644
index 3fbf658..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_1.j
+++ /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_anewarray_1.java
-.class public dxc/junit/opcodes/anewarray/jm/T_anewarray_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)[Ljava/lang/Object;
-    .limit stack 1
-    .limit locals 2
-
-    iload_1
-    anewarray java/lang/Object
-    areturn
-
-.end method
-
-.method public run2(I)[Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-
-    iload_1
-    anewarray java/lang/String
-    areturn
-
-.end method
-
-.method public run3(I)[Ljava/lang/Integer;
-    .limit stack 1
-    .limit locals 2
-
-    iload_1
-    anewarray java/lang/Integer
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_1.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_1.java
deleted file mode 100644
index 4358382..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_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 dxc.junit.opcodes.anewarray.jm;
-
-public class T_anewarray_1 {
-
-    public Object[] run(int idx) {
-        return new Object[idx];
-    }
-    
-    public String[] run2(int idx) {
-        return new String[idx];
-    }
-    
-    public Integer[] run3(int idx) {
-        return new Integer[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_2.cfh b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_2.cfh
deleted file mode 100644
index d2fef44..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_2.cfh
+++ /dev/null
@@ -1,191 +0,0 @@
-//@class:dxc/junit/opcodes/anewarray/jm/T_anewarray_2
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0010
-// .  .  
-   00 10 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0f 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 3, h: 0003: type{java.lang.String}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 37, len 3, h: 0004: type{dxc.junit.opcodes.anewarray.jm.T_anewarray_2}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 40, len 13, h: 0005: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 53, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 62, len 7, h: 0007: utf8{"run2"}
-    // .  .  .  r  u  n  2  
-       01 00 04 72 75 6e 32 
-    // parsed:, offset 69, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0c 
-    // parsed:, offset 74, len 47, h: 0009: utf8{"dxc/junit/opcodes/anewarray/jm/T_anewarray_2"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  a  n  e  w  a  r  r  a  y  /  j  m  /  T  _  a  n  e  w  a  r  r  a  y  _  2  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 61 6e 65 77 61 72 72 61 79 2f 6a 6d 2f 54 5f 61 6e 65 77 61 72 72 61 79 5f 32 
-    // parsed:, offset 121, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 128, len 19, h: 000b: utf8{"java/lang/String"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 
-    // parsed:, offset 147, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 153, len 21, h: 000d: utf8{"T_anewarray_2.java"}
-    // .  .  .  T  _  a  n  e  w  a  r  r  a  y  _  2  .  j  a  v  a  
-       01 00 12 54 5f 61 6e 65 77 61 72 72 61 79 5f 32 2e 6a 61 76 61 
-    // parsed:, offset 174, len 25, h: 000e: utf8{"(I)[Ljava/lang/String;"}
-    // .  .  .  (  I  )  [  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  
-       01 00 16 28 49 29 5b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 
-    // parsed:, offset 199, len 3, h: 000f: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 202, len 0, h: end constant_pool
-// parsed:, offset 202, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 204, len 2, h: this_class: type{dxc.junit.opcodes.anewarray.jm.T_anewarray_2}
-// .  .  
-   00 04 
-// parsed:, offset 206, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0f 
-// parsed:, offset 208, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 210, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 212, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 214, len:72,desc: ()V
-// parsed:, offset 214, len 0, h:  methods[0]: 
-    // parsed:, offset 214, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 216, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 218, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 220, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 222, len 0, h:  attributes[0]: 
-        // parsed:, offset 222, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 224, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 228, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 230, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 232, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 241, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 243, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 245, len 0, h: end attributes[0] 
-// parsed:, offset 245, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run2, offset 245, len:41,desc: (I)[Ljava/lang/String;
-// parsed:, offset 245, len 0, h:  methods[1]: 
-    // parsed:, offset 245, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 247, len 2, h: name: run2
-    // .  .  
-       00 07 
-    // parsed:, offset 249, len 2, h: descriptor: (I)[Ljava/lang/String;
-    // .  .  
-       00 0e 
-    // parsed:, offset 251, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 253, len 0, h:  attributes[0]: 
-        // parsed:, offset 253, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 255, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 259, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 261, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 263, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: anewarray type{java.lang.String}
-        // .  .  .  
-//@mod           bd 00 03 
-           bd 01 03           
-        // parsed:, offset 4, len 1, h: 0004: areturn
-        // .  
-           b0 
-        // parsed:, offset 272, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 274, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 276, len 0, h: end attributes[0] 
-// parsed:, offset 276, len 0, h: end methods[1] 
-// ========== end-ParseMember:run2, desc: (I)[Ljava/lang/String;
-// parsed:, offset 276, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 278, len 0, h:  attributes[0]: 
-    // parsed:, offset 278, len 2, h: name: SourceFile
-    // .  .  
-       00 05 
-    // parsed:, offset 280, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 284, len 2, h: source: utf8{"T_anewarray_2.java"}
-    // .  .  
-       00 0d 
-// parsed:, offset 286, len 0, h: end attributes[0] 
-// parsed:, offset 286, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_2.j b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_2.j
deleted file mode 100644
index 41c2fc2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_anewarray_2.java
-.class public dxc/junit/opcodes/anewarray/jm/T_anewarray_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run2(I)[Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-
-    iload_1
-    anewarray java/lang/String
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_2.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_2.java
deleted file mode 100644
index d58fa37..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_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 dxc.junit.opcodes.anewarray.jm;
-
-public class T_anewarray_2 {
-
-    public String[] run2(int idx) {
-        return new String[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_3.j b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_3.j
deleted file mode 100644
index 6e6f638..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_anewarray_3.java
-.class public dxc/junit/opcodes/anewarray/jm/T_anewarray_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run2(I)[Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-
-;    iload_1
-    anewarray java/lang/String
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_3.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_3.java
deleted file mode 100644
index c5b8e54..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_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 dxc.junit.opcodes.anewarray.jm;
-
-public class T_anewarray_3 {
-
-    public String[] run2(int idx) {
-        return new String[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_4.j b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_4.j
deleted file mode 100644
index 0ed6b0f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_anewarray_4.java
-.class public dxc/junit/opcodes/anewarray/jm/T_anewarray_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run2(F)[Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-
-    fload_1
-    anewarray java/lang/String
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_4.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_4.java
deleted file mode 100644
index 1256343..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_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 dxc.junit.opcodes.anewarray.jm;
-
-public class T_anewarray_4 {
-
-    public String[] run2(int idx) {
-        return new String[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_5.j b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_5.j
deleted file mode 100644
index d5d1770..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_anewarray_5.java
-.class public dxc/junit/opcodes/anewarray/jm/T_anewarray_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)[Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-
-    iload_1
-    anewarray [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[Ljava/lang/String;
-
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_5.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_5.java
deleted file mode 100644
index c0f8763..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_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 dxc.junit.opcodes.anewarray.jm;
-
-public class T_anewarray_5 {
-
-    public String[] run(int idx) {
-        return new String[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_6.j b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_6.j
deleted file mode 100644
index f2a5369..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_6.j
+++ /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_anewarray_6.java
-.class public dxc/junit/opcodes/anewarray/jm/T_anewarray_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Ljava/lang/Object;
-    .limit stack 1
-    .limit locals 1
-
-    iconst_1
-    anewarray dxc/junit/opcodes/anewarray/jm/T_anewarray_61
-    areturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_6.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_6.java
deleted file mode 100644
index 23fe874e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_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 dxc.junit.opcodes.anewarray.jm;
-
-public class T_anewarray_6 {
-
-    public Object run() {
-        return new T_anewarray_6[1];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_7.j b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_7.j
deleted file mode 100644
index 8915c0e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_7.j
+++ /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_anewarray_7.java
-.class public dxc/junit/opcodes/anewarray/jm/T_anewarray_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Ljava/lang/Object;
-    .limit stack 1
-    .limit locals 1
-
-    iconst_1
-    anewarray dxc/junit/opcodes/anewarray/TestStubs$TestStub
-    areturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_7.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_7.java
deleted file mode 100644
index b8a9997..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_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 dxc.junit.opcodes.anewarray.jm;
-
-public class T_anewarray_7 {
-
-    public Object run() {
-        return new T_anewarray_7[1];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_8.j b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_8.j
deleted file mode 100644
index 85e65ca..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_8.j
+++ /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_anewarray_8.java
-.class public dxc/junit/opcodes/anewarray/jm/T_anewarray_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run2(I)[Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    anewarray java/lang/String
-
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_8.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_8.java
deleted file mode 100644
index dc349ee..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_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 dxc.junit.opcodes.anewarray.jm;
-
-public class T_anewarray_8 {
-
-    public String[] run2(int idx) {
-        return new String[idx];
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_9.cfh b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_9.cfh
deleted file mode 100644
index 7f763fb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_9.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/anewarray/jm/T_anewarray_9
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0011
-// .  .  
-   00 11 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0f 00 09 
-    // parsed:, offset 15, len 47, h: 0002: utf8{"dxc/junit/opcodes/anewarray/jm/T_anewarray_9"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  a  n  e  w  a  r  r  a  y  /  j  m  /  T  _  a  n  e  w  a  r  r  a  y  _  9  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 61 6e 65 77 61 72 72 61 79 2f 6a 6d 2f 54 5f 61 6e 65 77 61 72 72 61 79 5f 39 
-    // parsed:, offset 62, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 81, len 3, h: 0004: type{java.lang.String}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 84, len 13, h: 0005: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 97, len 5, h: 0006: int{0x0000007b / 123}
-    // .  .  .  .  {  
-       03 00 00 00 7b 
-    // parsed:, offset 102, len 9, h: 0007: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 111, len 7, h: 0008: utf8{"run2"}
-    // .  .  .  r  u  n  2  
-       01 00 04 72 75 6e 32 
-    // parsed:, offset 118, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 07 00 0c 
-    // parsed:, offset 123, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 130, len 19, h: 000b: utf8{"java/lang/String"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 
-    // parsed:, offset 149, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 155, len 3, h: 000d: type{dxc.junit.opcodes.anewarray.jm.T_anewarray_9}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 158, len 25, h: 000e: utf8{"(I)[Ljava/lang/String;"}
-    // .  .  .  (  I  )  [  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  
-       01 00 16 28 49 29 5b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 
-    // parsed:, offset 183, len 3, h: 000f: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 186, len 21, h: 0010: utf8{"T_anewarray_9.java"}
-    // .  .  .  T  _  a  n  e  w  a  r  r  a  y  _  9  .  j  a  v  a  
-       01 00 12 54 5f 61 6e 65 77 61 72 72 61 79 5f 39 2e 6a 61 76 61 
-// parsed:, offset 207, len 0, h: end constant_pool
-// parsed:, offset 207, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 209, len 2, h: this_class: type{dxc.junit.opcodes.anewarray.jm.T_anewarray_9}
-// .  .  
-   00 0d 
-// parsed:, offset 211, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0f 
-// parsed:, offset 213, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 215, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 217, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 219, len:75,desc: ()V
-// parsed:, offset 219, len 0, h:  methods[0]: 
-    // parsed:, offset 219, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 221, len 2, h: name: <init>
-    // .  .  
-       00 07 
-    // parsed:, offset 223, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 225, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 227, len 0, h:  attributes[0]: 
-        // parsed:, offset 227, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 229, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 233, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 235, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 237, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 246, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 248, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 250, len 0, h: end attributes[0] 
-// parsed:, offset 250, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run2, offset 250, len:44,desc: (I)[Ljava/lang/String;
-// parsed:, offset 250, len 0, h:  methods[1]: 
-    // parsed:, offset 250, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 252, len 2, h: name: run2
-    // .  .  
-       00 08 
-    // parsed:, offset 254, len 2, h: descriptor: (I)[Ljava/lang/String;
-    // .  .  
-       00 0e 
-    // parsed:, offset 256, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 258, len 0, h:  attributes[0]: 
-        // parsed:, offset 258, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 260, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 264, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 266, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 268, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 2, h: 0000: ldc #+0000007b
-        // .  .  
-           12 06 
-        // parsed:, offset 2, len 1, h: 0002: pop
-        // W  
-           57 
-        // parsed:, offset 3, len 1, h: 0003: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 4, len 3, h: 0004: anewarray type{java.lang.String}
-        // .  .  .  
-//@mod           bd 00 04 
-           bd 00 06 
-        // parsed:, offset 7, len 1, h: 0007: areturn
-        // .  
-           b0 
-        // parsed:, offset 280, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 282, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 284, len 0, h: end attributes[0] 
-// parsed:, offset 284, len 0, h: end methods[1] 
-// ========== end-ParseMember:run2, desc: (I)[Ljava/lang/String;
-// parsed:, offset 284, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 286, len 0, h:  attributes[0]: 
-    // parsed:, offset 286, len 2, h: name: SourceFile
-    // .  .  
-       00 05 
-    // parsed:, offset 288, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 292, len 2, h: source: utf8{"T_anewarray_9.java"}
-    // .  .  
-       00 10 
-// parsed:, offset 294, len 0, h: end attributes[0] 
-// parsed:, offset 294, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_9.j b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_9.j
deleted file mode 100644
index d91f6f5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_9.j
+++ /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_anewarray_9.java
-.class public dxc/junit/opcodes/anewarray/jm/T_anewarray_9
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run2(I)[Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-    
-    ldc 123
-    pop
-    
-    iload_1
-    anewarray java/lang/String
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_9.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_9.java
deleted file mode 100644
index 30ab5f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/T_anewarray_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 dxc.junit.opcodes.anewarray.jm;
-
-public class T_anewarray_9 {
-
-    public String[] run2(int idx) {
-        return new String[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/TestStubs.java
deleted file mode 100644
index 73452fd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/anewarray/jm/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 dxc.junit.opcodes.anewarray.jm;
-
-public class TestStubs {
-    
-private class TestStub{
-    // testE4
-}
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/Runner.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/Runner.java
deleted file mode 100644
index 580812d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/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 dxc.junit.opcodes.areturn;
-
-public interface Runner {
-    public void doit();
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/RunnerGenerator.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/RunnerGenerator.java
deleted file mode 100644
index e9f34ec..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/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 dxc.junit.opcodes.areturn;
-
-public interface RunnerGenerator {
-    public Runner run();
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/Test_areturn.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/Test_areturn.java
deleted file mode 100644
index 5485d03..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/Test_areturn.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.areturn;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.areturn.jm.T_areturn_1;
-import dxc.junit.opcodes.areturn.jm.T_areturn_12;
-import dxc.junit.opcodes.areturn.jm.T_areturn_13;
-import dxc.junit.opcodes.areturn.jm.T_areturn_2;
-import dxc.junit.opcodes.areturn.jm.T_areturn_6;
-import dxc.junit.opcodes.areturn.jm.T_areturn_7;
-import dxc.junit.opcodes.areturn.jm.T_areturn_8;
-import dxc.junit.opcodes.areturn.jm.T_areturn_9;
-
-public class Test_areturn extends DxTestCase {
-
-    /**
-     * @title  simple
-     */
-    public void testN1() {
-        T_areturn_1 t = new T_areturn_1();
-        assertEquals("hello", t.run());
-    }
-
-    /**
-     * @title  simple
-     */
-    public void testN2() {
-        T_areturn_1 t = new T_areturn_1();
-        assertEquals(t, t.run2());
-    }
-
-    /**
-     * @title  simple
-     */
-    public void testN3() {
-        T_areturn_1 t = new T_areturn_1();
-        Integer a = 12345;
-        assertEquals(a, t.run3());
-    }
-
-    /**
-     * @title test for null
-     */
-    public void testN4() {
-        T_areturn_2 t = new T_areturn_2();
-        assertNull(t.run());
-    }
-
-    /**
-     * @title  check that frames are discarded and reinstananted correctly
-     */
-    public void testN5() {
-        T_areturn_6 t = new T_areturn_6();
-        assertEquals("hello", t.run());
-    }
-
-    /**
-     * @title  check that monitor is released by areturn
-     */
-    public void testN6() {
-        assertTrue(T_areturn_7.execute());
-    }
-
-    /**
-     * @title  assignment compatibility (TChild returned as TSuper)
-     */
-    public void testN7() {
-        // @uses dxc.junit.opcodes.areturn.jm.TSuper
-        // @uses dxc.junit.opcodes.areturn.jm.TInterface
-        // @uses dxc.junit.opcodes.areturn.jm.TChild
-        T_areturn_12 t = new T_areturn_12();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  assignment compatibility (TChild returned as TInterface)
-     */
-    public void testN8() {
-        // @uses dxc.junit.opcodes.areturn.jm.TInterface
-        // @uses dxc.junit.opcodes.areturn.jm.TChild
-        // @uses dxc.junit.opcodes.areturn.jm.TSuper
-        T_areturn_13 t = new T_areturn_13();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  Method is synchronized but thread is not monitor owner
-     */
-    public void testE1() {
-        T_areturn_8 t = new T_areturn_8();
-        try {
-            assertTrue(t.run());
-            fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Lock structural rule 1 is violated
-     */
-    public void testE2() {
-        T_areturn_9 t = new T_areturn_9();
-        try {
-            assertEquals("abc", t.run());
-            // the JVM spec says that it is optional to implement the structural
-            // lock rules, see JVM spec 8.13 and monitorenter/exit opcodes.
-            System.out.print("dvmvfe:");
-            //fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - void
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.areturn.jm.T_areturn_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.areturn.jm.T_areturn_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.areturn.jm.T_areturn_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.areturn.jm.T_areturn_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.areturn.jm.T_areturn_11");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title assignment incompatible references
-     */
-    public void testVFE6() {
-        // @uses dxc.junit.opcodes.areturn.jm.TInterface
-        // @uses dxc.junit.opcodes.areturn.jm.TSuper
-        // @uses dxc.junit.opcodes.areturn.jm.TChild
-        try {
-            Class.forName("dxc.junit.opcodes.areturn.jm.T_areturn_14");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title assignment incompatible references
-     */
-    @SuppressWarnings("cast")
-    public void testVFE7() {
-        // @uses dxc.junit.opcodes.areturn.jm.TSuper2
-        // @uses dxc.junit.opcodes.areturn.Runner
-        // @uses dxc.junit.opcodes.areturn.RunnerGenerator
-        try {
-            RunnerGenerator rg = (RunnerGenerator) Class.forName(
-                    "dxc.junit.opcodes.areturn.jm.T_areturn_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/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_1.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_1.j
deleted file mode 100644
index 900806d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_1.j
+++ /dev/null
@@ -1,59 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_areturn_1.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 1
-    .limit locals 1
-
-    ldc "hello"
-    areturn
-
-.end method
-
-.method public run2()Ljava/lang/Object;
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    areturn
-
-.end method
-
-.method public run3()Ljava/lang/Integer;
-    .limit stack 3
-    .limit locals 2
-
-    new java/lang/Integer
-    dup
-    sipush 12345
-    invokespecial java/lang/Integer/<init>(I)V
-    astore_1
-
-    aload_1
-
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_1.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_1.java
deleted file mode 100644
index a4a7719..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_1.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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_1 {
-
-    public String run() {
-        return "hello";
-    }
-    
-    public Object run2() {
-        return this;
-    }
-    
-    public Integer run3() {
-        Integer value = new Integer(12345);
-        return value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_10.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_10.j
deleted file mode 100644
index db962a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_10.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_areturn_10.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_10
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 1
-    .limit locals 1
-
-;    ldc "abc"
-    fconst_0
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_10.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_10.java
deleted file mode 100644
index efe5c5e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_10 {
-    
-    public String run() {
-        return "abc";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_11.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_11.j
deleted file mode 100644
index 1a75aee..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_11.j
+++ /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_areturn_11.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_11
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private static test()Ljava/lang/String;
-    .limit stack 1
-    .limit locals 0
-
-    ldc "hello"
-    areturn
-
-.end method
-
-.method public run()Ljava/lang/String;
-    .limit stack 0
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/areturn/jm/T_areturn_11/test()Ljava/lang/String;
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_11.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_11.java
deleted file mode 100644
index ea112ae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_11 {
-    
-    private static String test() {
-        return "hello";
-    }
-    
-    public String run() {
-        return test();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_12.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_12.j
deleted file mode 100644
index 76f51a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_12.j
+++ /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_areturn_12.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_12
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method private test()Ldxc/junit/opcodes/areturn/jm/TSuper;
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/opcodes/areturn/jm/TChild
-    dup
-    invokespecial dxc/junit/opcodes/areturn/jm/TChild/<init>()V
-
-    areturn
-.end method
-
-
-
-.method public run()Z
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    invokespecial dxc/junit/opcodes/areturn/jm/T_areturn_12/test()Ldxc/junit/opcodes/areturn/jm/TSuper;
-
-    instanceof dxc/junit/opcodes/areturn/jm/TChild
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_12.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_12.java
deleted file mode 100644
index 6aaa5f3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_12 {
-    
-    private TSuper test() {
-        return new TChild();
-    }
-    
-    public boolean run() {
-        TSuper t = test();
-        return (t instanceof TChild);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_13.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_13.j
deleted file mode 100644
index c0a8156..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_13.j
+++ /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 T_areturn_13.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_13
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method private test()Ldxc/junit/opcodes/areturn/jm/TInterface;
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/opcodes/areturn/jm/TChild
-    dup
-    invokespecial dxc/junit/opcodes/areturn/jm/TChild/<init>()V
-    areturn
-.end method
-
-
-
-.method public run()Z
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    invokespecial dxc/junit/opcodes/areturn/jm/T_areturn_13/test()Ldxc/junit/opcodes/areturn/jm/TInterface;
-
-    instanceof dxc/junit/opcodes/areturn/jm/TChild
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_13.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_13.java
deleted file mode 100644
index e79f765..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-
-public class T_areturn_13 {
-    
-    private TInterface test() {
-        return new TChild();
-    }
-    
-    public boolean run() {
-        TInterface t = test();
-        return (t instanceof TChild);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_14.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_14.j
deleted file mode 100644
index 221015e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_14.j
+++ /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_areturn_14.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_14
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method private test()Ldxc/junit/opcodes/areturn/jm/TChild;
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/opcodes/areturn/jm/TSuper
-    dup
-    invokespecial dxc/junit/opcodes/areturn/jm/TSuper/<init>()V
-
-    areturn
-
-.end method
-
-
-
-.method public run()Z
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    invokespecial dxc/junit/opcodes/areturn/jm/T_areturn_14/test()Ldxc/junit/opcodes/areturn/jm/TChild;
-
-    instanceof dxc/junit/opcodes/areturn/jm/TChild
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_14.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_14.java
deleted file mode 100644
index baa9963..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_14.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 dxc.junit.opcodes.areturn.jm;
-
-
-public class T_areturn_14 {
-    
-    private TChild test() {
-        //return new TSuper();
-        return new TChild();
-    }
-    
-    public boolean run() {
-        TChild t = test();
-        return (t instanceof TChild);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_15.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_15.j
deleted file mode 100644
index afa0940..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_15.j
+++ /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_areturn_15.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_15
-.super java/lang/Object
-.implements dxc/junit/opcodes/areturn/RunnerGenerator
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Ldxc/junit/opcodes/areturn/Runner;
-    .limit stack 2
-
-    new dxc/junit/opcodes/areturn/jm/TSuper2
-    dup
-    invokespecial dxc/junit/opcodes/areturn/jm/TSuper2/<init>()V
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_15.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_15.java
deleted file mode 100644
index bec3561..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_15.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 dxc.junit.opcodes.areturn.jm;
-
-
-public class T_areturn_15 {
-    
-    private TInterface test() {
-        //return new TSuper2();
-        return new TSuper();
-    }
-    
-    public boolean run() {
-        TInterface t = test();
-        return (t instanceof TSuper);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_2.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_2.j
deleted file mode 100644
index 20064df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_2.j
+++ /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_areturn_2.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Ljava/lang/Object;
-    .limit stack 2
-    aconst_null
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_2.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_2.java
deleted file mode 100644
index a8e0b9c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_2 {
-
-    public Object run() {
-        return null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_3.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_3.j
deleted file mode 100644
index d6e60f9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_areturn_3.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    ldc "hello"
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_3.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_3.java
deleted file mode 100644
index 813fc95..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_3 {
-
-    public String run() {
-        return "hello";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_4.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_4.j
deleted file mode 100644
index a7d470b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_areturn_4.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()F
-    .limit stack 1
-    .limit locals 1
-
-    ldc "hello"
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_4.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_4.java
deleted file mode 100644
index 0bc7d7c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_4 {
-
-    public String run() {
-        return "hello";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_5.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_5.j
deleted file mode 100644
index 753df23..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_areturn_5.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 1
-    .limit locals 1
-
-;    ldc "hello"
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_5.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_5.java
deleted file mode 100644
index 7463e46..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_5 {
-
-    public String run() {
-        return "hello";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_6.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_6.j
deleted file mode 100644
index 372e3e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_6.j
+++ /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.
-
-.source T_areturn_6.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/String;
-    .limit locals 6
-    .limit stack 3
-    
-    ldc "a"
-    astore_1
-    ldc "b"
-    astore_2
-    ldc "c"
-    astore 3
-    
-    ldc "d"
-    
-    invokestatic dxc/junit/opcodes/areturn/jm/T_areturn_6/test()Ljava/lang/String;
-    
-    ldc "ddd"
-    if_acmpne Label1
-    
-    ldc "d"
-    if_acmpne Label0
-    
-    aload_1
-    ldc "a"
-    if_acmpne Label0
-    
-    aload_2
-    ldc "b"
-    if_acmpne Label0
-    
-    aload 3
-    ldc "c"
-    if_acmpne Label0    
-    
-    ldc "hello"
-    areturn
-    
-Label1:
-    pop
-Label0:
-    ldc "a"
-    areturn    
-    
-.end method
-
-.method private static test()Ljava/lang/String;
-    .limit stack 1
-    .limit locals 3
-
-    ldc "aaa"
-    astore_0
-
-    ldc "bbb"
-    astore_1
-
-    ldc "ccc"
-    astore_2
-
-    ldc "ddd"
-
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_6.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_6.java
deleted file mode 100644
index 685c106b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_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/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_7.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_7.j
deleted file mode 100644
index c922898..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_7.j
+++ /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.
-
-.source T_areturn_7.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_7
-.super java/lang/Object
-.implements java/lang/Runnable
-
-.field  value Ljava/lang/Integer;
-.field  failed Z
-
-.method public <init>()V
-    .limit stack 4
-    .limit locals 1
-    
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    new java/lang/Integer
-    dup
-    iconst_0
-    invokespecial java/lang/Integer/<init>(I)V
-    putfield dxc.junit.opcodes.areturn.jm.T_areturn_7.value Ljava/lang/Integer;
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.areturn.jm.T_areturn_7.failed Z
-
-    return
-
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-    
-    iconst_0
-    istore_1
-
-Label4:
-    goto Label0
-
-Label1:
-    aload_0
-    invokespecial dxc/junit/opcodes/areturn/jm/T_areturn_7/test()Ljava/lang/Integer;
-    pop
-
-    iinc 1 1
-
-Label0:
-    iload_1
-    sipush 1000
-    if_icmplt Label1
-
-    return
-.end method
-
-
-
-.method private synchronized test()Ljava/lang/Integer;
-    .limit stack 4
-    .limit locals 2
-    
-    new java/lang/Integer
-    dup
-    aload_0
-    getfield dxc.junit.opcodes.areturn.jm.T_areturn_7.value Ljava/lang/Integer;
-    invokevirtual java/lang/Integer/intValue()I
-    iconst_1
-    iadd
-    invokespecial java/lang/Integer/<init>(I)V
-    astore_1
-
-    aload_0
-    aload_1
-    putfield dxc.junit.opcodes.areturn.jm.T_areturn_7.value Ljava/lang/Integer;
-
-    invokestatic java/lang/Thread/yield()V
-
-    aload_1
-    aload_0
-    getfield dxc.junit.opcodes.areturn.jm.T_areturn_7.value Ljava/lang/Integer;
-    if_acmpeq Label0
-
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.areturn.jm.T_areturn_7.failed Z
-
-Label0:
-    aload_1
-    areturn
-.end method
-
-
-
-.method public static execute()Z
-    .limit stack 3
-    .limit locals 4
-
-    new dxc/junit/opcodes/areturn/jm/T_areturn_7
-    dup
-    invokespecial dxc/junit/opcodes/areturn/jm/T_areturn_7/<init>()V
-    astore_0
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_1
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_2
-
-    aload_1
-    invokevirtual java/lang/Thread/start()V
-
-    aload_2
-    invokevirtual java/lang/Thread/start()V
-
-Label12:
-    ldc2_w 5000
-    invokestatic java/lang/Thread/sleep(J)V
-
-Label13:
-    goto Label0
-
-Label14:
-    astore_3
-
-Label10:
-    iconst_0
-    ireturn
-
-Label0:
-    aload_0
-    getfield dxc.junit.opcodes.areturn.jm.T_areturn_7.value Ljava/lang/Integer;
-    invokevirtual java/lang/Integer/intValue()I
-    sipush 2000
-    if_icmpeq Label1
-
-    iconst_0
-    ireturn
-
-Label1:
-    aload_0
-    getfield dxc.junit.opcodes.areturn.jm.T_areturn_7.failed Z
-    ifeq Label2
-    iconst_0
-    goto Label3
-
-Label2:
-    iconst_1
-
-Label3:
-    ireturn
-
-.catch java/lang/InterruptedException from Label12 to Label13 using Label14
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_7.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_7.java
deleted file mode 100644
index f58eb51..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_7.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 dxc.junit.opcodes.areturn.jm;
-
-import dxc.junit.opcodes.areturn.jm.T_areturn_7;
-
-public class T_areturn_7 implements Runnable {
-    public final static int CNT = 1000;
-    Integer value = new Integer(0);
-    boolean failed = false;
-    
-    public void run() {
-        for(int i = 0; i < CNT; i++) {
-            test();
-        }
-    }
-    
-    private synchronized Integer test()  {
-        Integer c = new Integer(value.intValue() + 1);
-        
-        value = c;
-        Thread.yield();
-        if(c != value)
-            failed = true;
-        return c;
-    }
-    
-    public static boolean execute() {
-        T_areturn_7 test = new T_areturn_7();
-        Thread t1 = new Thread(test);
-        Thread t2 = new Thread(test);
-        
-        t1.start();
-        t2.start();
-        
-        try
-        {
-            Thread.sleep(5000);
-        }
-        catch(InterruptedException ie) {
-            return false;
-        }
-        
-        if(test.value.intValue() != CNT * 2)
-            return false;
-        return !test.failed;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_8.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_8.j
deleted file mode 100644
index 953e5eb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_8.j
+++ /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_areturn_8.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private synchronized test()Ljava/lang/String;
-    .limit stack 1
-    .limit locals 1
- 
-    aload_0
-    monitorexit
-    ldc "abc"
-    areturn
-
-.end method
-
-.method public run()Z
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial dxc/junit/opcodes/areturn/jm/T_areturn_8/test()Ljava/lang/String;
-    pop
-
-    iconst_1
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_8.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_8.java
deleted file mode 100644
index f12ed82..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_8 {
-    
-    private synchronized String test() {
-        return "abc";
-    }
-    
-    public boolean run() {
-        test();
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_9.j b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_9.j
deleted file mode 100644
index 75b7309..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_9.j
+++ /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_areturn_9.java
-.class public dxc/junit/opcodes/areturn/jm/T_areturn_9
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    monitorenter
-    ldc "abc"
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_9.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_9.java
deleted file mode 100644
index df35df5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/T_areturn_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 dxc.junit.opcodes.areturn.jm;
-
-public class T_areturn_9 {
-    
-    public String run() {
-        return "abc";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/TetsStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/TetsStubs.java
deleted file mode 100644
index 7b46a68..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/areturn/jm/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 dxc.junit.opcodes.areturn.jm;
-
-
-interface TInterface{
-    
-}
-
-class TSuper implements TInterface {
-    
-}
-
-class TChild extends TSuper {
-    
-}
-
-class TSuper2 {
-    
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/Test_arraylength.java b/tools/dx-tests/src/dxc/junit/opcodes/arraylength/Test_arraylength.java
deleted file mode 100644
index f5dfd91..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/Test_arraylength.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 dxc.junit.opcodes.arraylength;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.arraylength.jm.T_arraylength_1;
-
-public class Test_arraylength extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_arraylength_1 t = new T_arraylength_1();
-        String[] a = new String[5];
-        assertEquals(5, t.run(a));
-    }
-
-    /**
-     * @title NullPointerException expected
-     */
-    public void testNPE1() {
-        T_arraylength_1 t = new T_arraylength_1();
-        try {
-            t.run(null);
-            fail("NPE expected");
-        } catch (NullPointerException npe) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - Object
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.arraylength.jm.T_arraylength_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.arraylength.jm.T_arraylength_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_1.j b/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_1.j
deleted file mode 100644
index 75cd6f5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_1.j
+++ /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 T_arraylength_1.java
-.class public dxc/junit/opcodes/arraylength/jm/T_arraylength_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([Ljava/lang/Object;)I
-    .limit stack 1
-    .limit locals 2
-    aload_1
-    arraylength
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_1.java b/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_1.java
deleted file mode 100644
index 7b204689..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_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 dxc.junit.opcodes.arraylength.jm;
-
-public class T_arraylength_1 {
-
-    public int run(Object[] arr) {
-        return arr.length;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_2.j b/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_2.j
deleted file mode 100644
index 469b364..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_2.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.class public dxc/junit/opcodes/arraylength/jm/T_arraylength_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 2
-
-    aload_0            ; load "this" pointer
-    arraylength
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_2.java b/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_2.java
deleted file mode 100644
index 4ec2183..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_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 dxc.junit.opcodes.arraylength.jm;
-
-public class T_arraylength_2 {
-
-    public int run() {
-        byte[] ba = null;
-        return ba.length;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_3.j b/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_3.j
deleted file mode 100644
index 30e8cd0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.class public dxc/junit/opcodes/arraylength/jm/T_arraylength_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 2
-
-    iconst_1
-    arraylength
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_3.java b/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_3.java
deleted file mode 100644
index 6723a27..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/arraylength/jm/T_arraylength_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 dxc.junit.opcodes.arraylength.jm;
-
-public class T_arraylength_3 {
-
-    public int run() {
-        byte[] ba = null;
-        return ba.length;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/Test_astore.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/Test_astore.java
deleted file mode 100644
index 6e99ace..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/Test_astore.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.astore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.astore.jm.T_astore_1;
-import dxc.junit.opcodes.astore.jm.T_astore_1_w;
-import dxc.junit.opcodes.astore.jm.T_astore_5;
-import dxc.junit.opcodes.astore.jm.T_astore_5_w;
-
-public class Test_astore extends DxTestCase {
-
-    /*
-     * NORMAL astore VERSION
-     */
-
-    /**
-     * @title  astore 0
-     */
-    public void testN1() {
-        assertEquals("hello", T_astore_1.run());
-    }
-
-    /**
-     * @title  astore 255
-     */
-    public void testN2() {
-        assertEquals("world", T_astore_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore.jm.T_astore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore.jm.T_astore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore.jm.T_astore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE astore VERSION
-     */
-
-    /**
-     * @title  astore_w 0
-     */
-    public void testN3() {
-        assertEquals("hello", T_astore_1_w.run());
-    }
-
-    /**
-     * @title  astore 257
-     */
-    public void testN4() {
-        assertEquals("world", T_astore_5_w.run());
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore.jm.T_astore_2_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore.jm.T_astore_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore.jm.T_astore_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1.j
deleted file mode 100644
index 8791368..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1.j
+++ /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_astore_1.java
-.class public dxc/junit/opcodes/astore/jm/T_astore_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 2
-    .limit locals 1
-    
-    ldc "hello"
-    astore 0
-    ldc "hi"
-    aload 0
-    areturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1.java
deleted file mode 100644
index cb6c942..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_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 dxc.junit.opcodes.astore.jm;
-
-public class T_astore_1 {
-
-    public static String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1_w.j
deleted file mode 100644
index fb6432e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1_w.j
+++ /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_astore_1_w.java
-.class public dxc/junit/opcodes/astore/jm/T_astore_1_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 4
-    .limit locals 2
-    
-    ldc "hello"
-    astore_w 0
-    ldc "hi"
-    aload 0
-    areturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1_w.java
deleted file mode 100644
index ee352e6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_1_w.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 dxc.junit.opcodes.astore.jm;
-
-public class T_astore_1_w {
-    
-    public static String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2.j
deleted file mode 100644
index 82d9f21..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_2.java
-.class public dxc/junit/opcodes/astore/jm/T_astore_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 0
-
-    astore 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2.java
deleted file mode 100644
index d6a8eff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_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 dxc.junit.opcodes.astore.jm;
-
-public class T_astore_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2_w.j
deleted file mode 100644
index 935d039..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_2_w.java
-.class public dxc/junit/opcodes/astore/jm/T_astore_2_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 0
-
-    astore_w 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2_w.java
deleted file mode 100644
index 13ddd3b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_2_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.astore.jm;
-
-public class T_astore_2_w {
-    
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3.j
deleted file mode 100644
index 8c74ad3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_3.java
-.class public dxc/junit/opcodes/astore/jm/T_astore_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 2
-
-    fconst_1
-    astore 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3.java
deleted file mode 100644
index a8887d0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_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 dxc.junit.opcodes.astore.jm;
-
-public class T_astore_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3_w.j
deleted file mode 100644
index 7988f8a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_3_w.java
-.class public dxc/junit/opcodes/astore/jm/T_astore_3_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 3
-    .limit locals 2
-
-    fconst_1
-    astore_w 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3_w.java
deleted file mode 100644
index c4c8d3b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_3_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.astore.jm;
-
-public class T_astore_3_w {
-    
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4.j
deleted file mode 100644
index 5a3031a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_4.java
-.class public dxc/junit/opcodes/astore/jm/T_astore_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 2
-
-    lconst_1
-    astore 0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4.java
deleted file mode 100644
index 3a20228..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_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 dxc.junit.opcodes.astore.jm;
-
-public class T_astore_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4_w.j
deleted file mode 100644
index 29e8922..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_4_w.java
-.class public dxc/junit/opcodes/astore/jm/T_astore_4_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 1
-
-    iconst_1
-    astore 0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4_w.java
deleted file mode 100644
index 078beb6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_4_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.astore.jm;
-
-public class T_astore_4_w {
-    
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5.j
deleted file mode 100644
index 1d7c782..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5.j
+++ /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_astore_5.java
-.class public dxc/junit/opcodes/astore/jm/T_astore_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 2
-    .limit locals 300
-    
-    ldc "world"
-    astore 255
-    ldc "hi"
-    aload 255
-    areturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5.java
deleted file mode 100644
index c950130..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_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 dxc.junit.opcodes.astore.jm;
-
-public class T_astore_5 {
-
-    public static String run() {
-        return "world";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5_w.j
deleted file mode 100644
index 690924f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5_w.j
+++ /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_astore_5_w.java
-.class public dxc/junit/opcodes/astore/jm/T_astore_5_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 2
-    .limit locals 300
-    
-    ldc "world"
-    astore_w 257
-    ldc "hi"
-    aload 257
-    areturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5_w.java
deleted file mode 100644
index c74bcd9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_5_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.astore.jm;
-
-public class T_astore_5_w {
-    
-    public static String run() {
-        return "world";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_6.java b/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_6.java
deleted file mode 100644
index 6518de1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore/jm/T_astore_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 dxc.junit.opcodes.astore.jm;
-
-public class T_astore_6 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/Test_astore_0.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/Test_astore_0.java
deleted file mode 100644
index 179ae7b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/Test_astore_0.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.astore_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.astore_0.jm.T_astore_0_1;
-import dxc.junit.opcodes.astore_0.jm.T_astore_0_5;
-
-public class Test_astore_0 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals("hello", T_astore_0_1.run());
-    }
-
-    /**
-     * @title equality of astore_<n> and astore <n>
-     */
-    public void testN2() {
-        assertTrue(T_astore_0_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_0.jm.T_astore_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_0.jm.T_astore_0_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_0.jm.T_astore_0_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_1.j
deleted file mode 100644
index 50c2732..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_1.j
+++ /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_astore_0_1.java
-.class public dxc/junit/opcodes/astore_0/jm/T_astore_0_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 2
-    .limit locals 1
-    
-    ldc "hello"
-    astore_0
-    ldc "hi"
-    aload_0
-    areturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_1.java
deleted file mode 100644
index 022182d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_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 dxc.junit.opcodes.astore_0.jm;
-
-public class T_astore_0_1 {
-
-    public static String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_2.j
deleted file mode 100644
index 1130fc4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_0_2.java
-.class public dxc/junit/opcodes/astore_0/jm/T_astore_0_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 0
-
-    astore_0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_2.java
deleted file mode 100644
index 10af6e6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_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 dxc.junit.opcodes.astore_0.jm;
-
-public class T_astore_0_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_3.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_3.j
deleted file mode 100644
index 737a6ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_0_3.java
-.class public dxc/junit/opcodes/astore_0/jm/T_astore_0_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 1
-
-    fconst_1
-    astore_0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_3.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_3.java
deleted file mode 100644
index 0e4e1cb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_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 dxc.junit.opcodes.astore_0.jm;
-
-public class T_astore_0_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_4.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_4.j
deleted file mode 100644
index c8e268b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_0_4.java
-.class public dxc/junit/opcodes/astore_0/jm/T_astore_0_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 1
-
-    lconst_1
-    astore_0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_4.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_4.java
deleted file mode 100644
index 4b54fd7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_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 dxc.junit.opcodes.astore_0.jm;
-
-public class T_astore_0_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_5.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_5.j
deleted file mode 100644
index f7a1082..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_5.j
+++ /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_astore_0_5.java
-.class public dxc/junit/opcodes/astore_0/jm/T_astore_0_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 2
-
-    ldc "hello"
-    astore_0
-    aload_0
-    
-    ldc "hello"
-    astore 0
-    aload_0
-    
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_5.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_5.java
deleted file mode 100644
index 90f895e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_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 dxc.junit.opcodes.astore_0.jm;
-
-public class T_astore_0_5 {
-
-    public static boolean run() {
-        String a = new String("hello");
-        return a == a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_6.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_6.java
deleted file mode 100644
index 9b32ca6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_0/jm/T_astore_0_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 dxc.junit.opcodes.astore_0.jm;
-
-public class T_astore_0_6 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/Test_astore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/Test_astore_1.java
deleted file mode 100644
index 48c46b3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/Test_astore_1.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.astore_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.astore_1.jm.T_astore_1_1;
-import dxc.junit.opcodes.astore_1.jm.T_astore_1_5;
-
-public class Test_astore_1 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals("hello", T_astore_1_1.run());
-    }
-
-    /**
-     * @title equality of astore_<n> and astore <n>
-     */
-    public void testN2() {
-        assertTrue(T_astore_1_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_1.jm.T_astore_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_1.jm.T_astore_1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_1.jm.T_astore_1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_1.j
deleted file mode 100644
index 0e3adb6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_1.j
+++ /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_astore_1_1.java
-.class public dxc/junit/opcodes/astore_1/jm/T_astore_1_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 2
-    .limit locals 2
-    
-    ldc "hello"
-    astore_1
-    ldc "hi"
-    aload_1
-    areturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_1.java
deleted file mode 100644
index 6ce3fcc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_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 dxc.junit.opcodes.astore_1.jm;
-
-public class T_astore_1_1 {
-
-    public static String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_2.j
deleted file mode 100644
index 91110d9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_1_2.java
-.class public dxc/junit/opcodes/astore_1/jm/T_astore_1_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 0
-
-    astore_1
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_2.java
deleted file mode 100644
index 138f5cb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_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 dxc.junit.opcodes.astore_1.jm;
-
-public class T_astore_1_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_3.j
deleted file mode 100644
index 2f86fe7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_1_3.java
-.class public dxc/junit/opcodes/astore_1/jm/T_astore_1_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 2
-
-    fconst_1
-    astore_1
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_3.java
deleted file mode 100644
index 73e0f14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_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 dxc.junit.opcodes.astore_1.jm;
-
-public class T_astore_1_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_4.j
deleted file mode 100644
index 6581c7c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_1_4.java
-.class public dxc/junit/opcodes/astore_1/jm/T_astore_1_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 2
-
-    lconst_1
-    astore_1
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_4.java
deleted file mode 100644
index 8f831cc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_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 dxc.junit.opcodes.astore_1.jm;
-
-public class T_astore_1_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_5.j
deleted file mode 100644
index 4189fb3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_5.j
+++ /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_astore_1_5.java
-.class public dxc/junit/opcodes/astore_1/jm/T_astore_1_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 2
-
-    ldc "hello"
-    astore_1
-    aload_1
-
-    ldc "hello"
-    astore 1
-    aload 1
-    
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_5.java
deleted file mode 100644
index a45382f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_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 dxc.junit.opcodes.astore_1.jm;
-
-public class T_astore_1_5 {
-
-    public static boolean run() {
-        String a = new String("hello");
-        return a == a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_6.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_6.java
deleted file mode 100644
index d0e3916..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_1/jm/T_astore_1_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 dxc.junit.opcodes.astore_1.jm;
-
-public class T_astore_1_6 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/Test_astore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/Test_astore_2.java
deleted file mode 100644
index 4d05fd2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/Test_astore_2.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.astore_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.astore_2.jm.T_astore_2_1;
-import dxc.junit.opcodes.astore_2.jm.T_astore_2_5;
-
-public class Test_astore_2 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals("hello", T_astore_2_1.run());
-    }
-
-    /**
-     * @title equality of astore_<n> and astore <n>
-     */
-    public void testN2() {
-        assertTrue(T_astore_2_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_2.jm.T_astore_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_2.jm.T_astore_2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_2.jm.T_astore_2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_1.j
deleted file mode 100644
index a974ce1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_1.j
+++ /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_astore_2_1.java
-.class public dxc/junit/opcodes/astore_2/jm/T_astore_2_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 2
-    .limit locals 3
-    
-    ldc "hello"
-    astore_2
-    ldc "hi"
-    aload_2
-    areturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_1.java
deleted file mode 100644
index e581790..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_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 dxc.junit.opcodes.astore_2.jm;
-
-public class T_astore_2_1 {
-
-    public static String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_2.j
deleted file mode 100644
index 750b538..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_2_2.java
-.class public dxc/junit/opcodes/astore_2/jm/T_astore_2_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 0
-
-    astore_2
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_2.java
deleted file mode 100644
index ee9ffbd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_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 dxc.junit.opcodes.astore_2.jm;
-
-public class T_astore_2_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_3.j
deleted file mode 100644
index 135abe7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_2_3.java
-.class public dxc/junit/opcodes/astore_2/jm/T_astore_2_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 3
-
-    fconst_2
-    astore_2
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_3.java
deleted file mode 100644
index 3c70ad7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_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 dxc.junit.opcodes.astore_2.jm;
-
-public class T_astore_2_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_4.j
deleted file mode 100644
index 4708e55..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_2_4.java
-.class public dxc/junit/opcodes/astore_2/jm/T_astore_2_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 3
-
-    lconst_1
-    astore_2
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_4.java
deleted file mode 100644
index 46e882d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_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 dxc.junit.opcodes.astore_2.jm;
-
-public class T_astore_2_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_5.j
deleted file mode 100644
index f7edded..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_5.j
+++ /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_astore_2_5.java
-.class public dxc/junit/opcodes/astore_2/jm/T_astore_2_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 3
-
-    ldc "hello"
-    astore_2
-    aload_2
-
-    ldc "hello"
-    astore 2
-    aload_2
-    
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_5.java
deleted file mode 100644
index 1b31c7d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_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 dxc.junit.opcodes.astore_2.jm;
-
-public class T_astore_2_5 {
-
-    public static boolean run() {
-        String a = new String("hello");
-        return a == a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_6.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_6.java
deleted file mode 100644
index f610892..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_2/jm/T_astore_2_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 dxc.junit.opcodes.astore_2.jm;
-
-public class T_astore_2_6 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/Test_astore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/Test_astore_3.java
deleted file mode 100644
index f8ca21f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/Test_astore_3.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.astore_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.astore_3.jm.T_astore_3_1;
-import dxc.junit.opcodes.astore_3.jm.T_astore_3_5;
-
-public class Test_astore_3 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals("hello", T_astore_3_1.run());
-    }
-
-    /**
-     * @title equality of astore_<n> and astore <n>
-     */
-    public void testN2() {
-        assertTrue(T_astore_3_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_3.jm.T_astore_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_3.jm.T_astore_3_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.astore_3.jm.T_astore_3_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_1.j
deleted file mode 100644
index 12cbc00a4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_1.j
+++ /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_astore_3_1.java
-.class public dxc/junit/opcodes/astore_3/jm/T_astore_3_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Ljava/lang/String;
-    .limit stack 2
-    .limit locals 4
-    
-    ldc "hello"
-    astore_3
-    ldc "hi"
-    aload_3
-    areturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_1.java
deleted file mode 100644
index 5a118f5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_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 dxc.junit.opcodes.astore_3.jm;
-
-public class T_astore_3_1 {
-
-    public static String run() {
-        String a = new String("hello");
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_2.j
deleted file mode 100644
index a9c6268..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_3_2.java
-.class public dxc/junit/opcodes/astore_3/jm/T_astore_3_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 0
-
-    astore_3
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_2.java
deleted file mode 100644
index d11fc80..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_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 dxc.junit.opcodes.astore_3.jm;
-
-public class T_astore_3_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_3.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_3.j
deleted file mode 100644
index 52de374..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_3_3.java
-.class public dxc/junit/opcodes/astore_3/jm/T_astore_3_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 4
-
-    fconst_2
-    astore_3
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_3.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_3.java
deleted file mode 100644
index b2aef96..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_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 dxc.junit.opcodes.astore_3.jm;
-
-public class T_astore_3_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_4.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_4.j
deleted file mode 100644
index c6623fd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_astore_3_4.java
-.class public dxc/junit/opcodes/astore_3/jm/T_astore_3_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 4
-
-    lconst_1
-    astore_3
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_4.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_4.java
deleted file mode 100644
index ae42784..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_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 dxc.junit.opcodes.astore_3.jm;
-
-public class T_astore_3_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_5.j b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_5.j
deleted file mode 100644
index c04ef0b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_5.j
+++ /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_astore_3_5.java
-.class public dxc/junit/opcodes/astore_3/jm/T_astore_3_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 4
-
-    ldc "hello"
-    astore_3
-    aload_3
-
-    ldc "hello"
-    astore 3
-    aload_3
-    
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_5.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_5.java
deleted file mode 100644
index c94d01a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_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 dxc.junit.opcodes.astore_3.jm;
-
-public class T_astore_3_5 {
-
-    public static boolean run() {
-        String a = new String("hello");
-        return a == a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_6.java b/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_6.java
deleted file mode 100644
index 3250a5f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/astore_3/jm/T_astore_3_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 dxc.junit.opcodes.astore_3.jm;
-
-public class T_astore_3_6 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/Test_athrow.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/Test_athrow.java
deleted file mode 100644
index c8829e3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/Test_athrow.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 dxc.junit.opcodes.athrow;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.athrow.jm.T_athrow_1;
-import dxc.junit.opcodes.athrow.jm.T_athrow_11;
-import dxc.junit.opcodes.athrow.jm.T_athrow_12;
-import dxc.junit.opcodes.athrow.jm.T_athrow_2;
-import dxc.junit.opcodes.athrow.jm.T_athrow_4;
-import dxc.junit.opcodes.athrow.jm.T_athrow_5;
-import dxc.junit.opcodes.athrow.jm.T_athrow_8;
-
-public class Test_athrow extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_athrow_1 t = new T_athrow_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_athrow_2 t = new T_athrow_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_athrow_8 t = new T_athrow_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_athrow_12 t = new T_athrow_12();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  NullPointerException If objectref is null, athrow throws
-     * a NullPointerException instead of objectref
-     */
-    public void testE1() {
-        T_athrow_4 t = new T_athrow_4();
-        try {
-            t.run();
-            fail("expected NullPointerException");
-        } catch (NullPointerException npe) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  IllegalMonitorStateException expected
-     */
-    public void testE2() {
-        T_athrow_5 t = new T_athrow_5();
-        try {
-            t.run();
-            fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @title IllegalMonitorStateException if structural lock rule violated -
-     */
-    public void testE3() {
-        T_athrow_11 t = new T_athrow_11();
-        try {
-            t.run();
-            fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        } catch (NullPointerException npe) {
-            // the JVM spec says that it is optional to implement the structural
-            // lock rules, see JVM spec 8.13 and monitorenter/exit opcodes.
-            System.out.print("dvmvfe:");
-            //fail ("expected IllegalMonitorStateException, but got NPE");
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.19
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.athrow.jm.T_athrow_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.athrow.jm.T_athrow_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.athrow.jm.T_athrow_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1 
-     * @title type of argument - String
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.athrow.jm.T_athrow_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.19 
-     * @title Throwing of the objectref on the class which is not
-     *          the class Throwable or a subclass of Throwable.
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.athrow.jm.T_athrow_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_1.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_1.j
deleted file mode 100644
index 6c0c1a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_1.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_athrow_1.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    new java/lang/RuntimeException
-    dup
-    invokespecial java/lang/RuntimeException/<init>()V
-    athrow
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_1.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_1.java
deleted file mode 100644
index 657ed24..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_1 {
-
-    public void run() {
-        throw new RuntimeException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_10.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_10.j
deleted file mode 100644
index 96562a9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_10.j
+++ /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_athrow_10.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_10
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    new    java/lang/String
-    dup
-    invokespecial java/lang/String/<init>()V
-    athrow
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_10.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_10.java
deleted file mode 100644
index e9aceca..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_10 {
-    
-    public void run() {
-        throw new RuntimeException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_11.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_11.j
deleted file mode 100644
index 37429eb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_11.j
+++ /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_athrow_11.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private test()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    monitorenter
-
-    new java/lang/NullPointerException
-    dup
-    invokespecial java/lang/NullPointerException/<init>()V
-
-    athrow
-
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial dxc/junit/opcodes/athrow/jm/T_athrow_11/test()V
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_11.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_11.java
deleted file mode 100644
index 43a0f0a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_11 {
-
-    private void test() {
-        throw new NullPointerException();
-    }
-    
-    public void run() {
-        test();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_12.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_12.j
deleted file mode 100644
index fc0ba94..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_12.j
+++ /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_athrow_12.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_12
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-
-Label0:
-    new java/lang/RuntimeException
-    dup
-    invokespecial java/lang/RuntimeException/<init>()V
-    athrow
-
-Label5:
-    astore_1
-Label2:
-    iconst_1
-    ireturn
-
-Label3:
-    astore_1
-    iconst_0
-    ireturn
-
-.catch java/lang/RuntimeException from Label0 to Label5 using Label5
-.catch java/lang/RuntimeException from Label0 to Label2 using Label3
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_12.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_12.java
deleted file mode 100644
index b7aca69..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_12.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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_12 {
-
-    public boolean run() {
-        try{
-            try {
-                throw new RuntimeException();
-            }catch(RuntimeException e1) {
-                return true;
-            }
-        } catch(RuntimeException e2) {
-        }
-        return false;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_2.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_2.j
deleted file mode 100644
index 7df7277..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_2.j
+++ /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_athrow_2.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .throws java/lang/Throwable
-    .limit stack 2
-    .limit locals 1
-
-    new java/lang/Throwable
-    dup
-    invokespecial java/lang/Throwable/<init>()V
-    athrow
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_2.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_2.java
deleted file mode 100644
index 13be1ee..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_2 {
-
-    public void run() throws Throwable {
-        throw new Throwable();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_3.cfh b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_3.cfh
deleted file mode 100644
index d95df9e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_3.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/athrow/jm/T_athrow_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0010
-// .  .  
-   00 10 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0f 00 07 
-    // parsed:, offset 15, len 5, h: 0002: method{java.lang.RuntimeException.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 07 
-    // parsed:, offset 20, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 39, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 52, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 61, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 67, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0c 
-    // parsed:, offset 72, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 79, len 18, h: 0009: utf8{"T_athrow_3.java"}
-    // .  .  .  T  _  a  t  h  r  o  w  _  3  .  j  a  v  a  
-       01 00 0f 54 5f 61 74 68 72 6f 77 5f 33 2e 6a 61 76 61 
-    // parsed:, offset 97, len 41, h: 000a: utf8{"dxc/junit/opcodes/athrow/jm/T_athrow_3"}
-    // .  .  &  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  a  t  h  r  o  w  /  j  m  /  T  _  a  t  h  r  o  w  _  3  
-       01 00 26 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 61 74 68 72 6f 77 2f 6a 6d 2f 54 5f 61 74 68 72 6f 77 5f 33 
-    // parsed:, offset 138, len 29, h: 000b: utf8{"java/lang/RuntimeException"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  R  u  n  t  i  m  e  E  x  c  e  p  t  i  o  n  
-       01 00 1a 6a 61 76 61 2f 6c 61 6e 67 2f 52 75 6e 74 69 6d 65 45 78 63 65 70 74 69 6f 6e 
-    // parsed:, offset 167, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 173, len 3, h: 000d: type{java.lang.RuntimeException}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 176, len 3, h: 000e: type{dxc.junit.opcodes.athrow.jm.T_athrow_3}
-    // .  .  .  
-       07 00 0a 
-    // parsed:, offset 179, len 3, h: 000f: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 182, len 0, h: end constant_pool
-// parsed:, offset 182, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 184, len 2, h: this_class: type{dxc.junit.opcodes.athrow.jm.T_athrow_3}
-// .  .  
-   00 0e 
-// parsed:, offset 186, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0f 
-// parsed:, offset 188, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 190, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 192, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 194, len:75,desc: ()V
-// parsed:, offset 194, len 0, h:  methods[0]: 
-    // parsed:, offset 194, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 196, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 198, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 200, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 202, len 0, h:  attributes[0]: 
-        // parsed:, offset 202, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 204, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 208, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 210, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 212, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 221, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 223, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 225, len 0, h: end attributes[0] 
-// parsed:, offset 225, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 225, len:44,desc: ()V
-// parsed:, offset 225, len 0, h:  methods[1]: 
-    // parsed:, offset 225, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 227, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 229, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 231, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 233, len 0, h:  attributes[0]: 
-        // parsed:, offset 233, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 235, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 239, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 241, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 243, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 3, h: 0000: new type{java.lang.RuntimeException}
-        // .  .  .  
-//@mod           bb 00 0d 
-           bb 01 0d           
-        // parsed:, offset 3, len 1, h: 0003: dup
-        // Y  
-           59 
-        // parsed:, offset 4, len 3, h: 0004: invokespecial method{java.lang.RuntimeException.<init>:()V}
-        // .  .  .  
-           b7 00 02 
-        // parsed:, offset 7, len 1, h: 0007: athrow
-        // .  
-           bf 
-        // parsed:, offset 255, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 257, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 259, len 0, h: end attributes[0] 
-// parsed:, offset 259, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 259, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 261, len 0, h:  attributes[0]: 
-    // parsed:, offset 261, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 263, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 267, len 2, h: source: utf8{"T_athrow_3.java"}
-    // .  .  
-       00 09 
-// parsed:, offset 269, len 0, h: end attributes[0] 
-// parsed:, offset 269, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_3.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_3.j
deleted file mode 100644
index c4ea4ad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_3.j
+++ /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_athrow_3.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    new java/lang/RuntimeException
-    dup
-    invokespecial java/lang/RuntimeException/<init>()V
-    athrow
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_3.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_3.java
deleted file mode 100644
index 8d985e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_3 {
-
-    public void run() {
-        throw new RuntimeException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_4.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_4.j
deleted file mode 100644
index 9f74fd7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_athrow_4.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    aconst_null
-    athrow
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_4.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_4.java
deleted file mode 100644
index a50d5cd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_4 {
-
-    public void run() {
-        throw new RuntimeException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_5.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_5.j
deleted file mode 100644
index 887180b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_5.j
+++ /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_athrow_5.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public synchronized run()V
-    .limit stack 2
-    .limit locals 1
-    
-    aload_0
-    monitorexit
-    
-    new java/lang/NullPointerException
-    dup
-    invokespecial java/lang/NullPointerException/<init>()V
-
-    athrow
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_5.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_5.java
deleted file mode 100644
index 3296cda..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_5 {
-
-    public synchronized void run() {
-            throw new NullPointerException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_6.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_6.j
deleted file mode 100644
index 754f150..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_6.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_athrow_6.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    athrow
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_6.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_6.java
deleted file mode 100644
index 0ec671c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_6 {
-
-    public void run() {
-        throw new RuntimeException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_7.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_7.j
deleted file mode 100644
index 7ef0094..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_athrow_7.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_7
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    fconst_0
-    athrow
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_7.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_7.java
deleted file mode 100644
index 8b4146c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_7 {
-    
-    public void run() {
-        throw new RuntimeException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_8.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_8.j
deleted file mode 100644
index 6a3a04a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_8.j
+++ /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_athrow_8.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .throws java/lang/Error
-    .limit stack 2
-    .limit locals 1
-
-    new java/lang/Error
-    dup
-    invokespecial java/lang/Error/<init>()V
-    athrow
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_8.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_8.java
deleted file mode 100644
index 0ee1856..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_8 {
-
-    public void run() throws Error {
-        throw new Error();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_9.j b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_9.j
deleted file mode 100644
index 6bcef31..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_9.j
+++ /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_athrow_9.java
-.class public dxc/junit/opcodes/athrow/jm/T_athrow_9
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    new java/lang/Object
-    dup
-    invokespecial java/lang/RuntimeException/<init>()V
-    athrow
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_9.java b/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_9.java
deleted file mode 100644
index 9dea3b5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/athrow/jm/T_athrow_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 dxc.junit.opcodes.athrow.jm;
-
-public class T_athrow_9 {
-    
-    public void run() {
-        throw new RuntimeException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/Test_baload.java b/tools/dx-tests/src/dxc/junit/opcodes/baload/Test_baload.java
deleted file mode 100644
index 8cd4511..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/Test_baload.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 dxc.junit.opcodes.baload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.baload.jm.T_baload_1;
-
-public class Test_baload extends DxTestCase {
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN1() {
-        T_baload_1 t = new T_baload_1();
-        byte[] arr = new byte[2];
-        arr[1] = 100;
-        assertEquals(100, t.run(arr, 1));
-    }
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN2() {
-        T_baload_1 t = new T_baload_1();
-        byte[] arr = new byte[2];
-        arr[0] = 100;
-        assertEquals(100, t.run(arr, 0));
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_baload_1 t = new T_baload_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_baload_1 t = new T_baload_1();
-        try {
-            t.run(null, 2);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_baload_1 t = new T_baload_1();
-        byte[] arr = new byte[2];
-        try {
-            t.run(arr, -1);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.baload.jm.T_baload_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.baload.jm.T_baload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.baload.jm.T_baload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.baload.jm.T_baload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - Object, short
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.baload.jm.T_baload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], short
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.baload.jm.T_baload_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int[], int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.baload.jm.T_baload_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.baload.jm.T_baload_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_1.j
deleted file mode 100644
index 1d028c0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_1.j
+++ /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_baload_1.java
-.class public dxc/junit/opcodes/baload/jm/T_baload_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([BI)B
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-
-    baload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_1.java
deleted file mode 100644
index bfb95ad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_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 dxc.junit.opcodes.baload.jm;
-
-public class T_baload_1 {
-    public byte run(byte[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_2.j
deleted file mode 100644
index d21f2e7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_2.j
+++ /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_baload_2.java
-.class public dxc/junit/opcodes/baload/jm/T_baload_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([BI)B
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-;    iload_2
-
-    baload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_2.java
deleted file mode 100644
index 74f6686..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_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 dxc.junit.opcodes.baload.jm;
-
-public class T_baload_2 {
-
-    public byte run(byte[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_3.j
deleted file mode 100644
index 7f20dfb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_baload_3.java
-.class public dxc/junit/opcodes/baload/jm/T_baload_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([BI)B
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    baload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_3.java
deleted file mode 100644
index f9ffedd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_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 dxc.junit.opcodes.baload.jm;
-
-public class T_baload_3 {
-
-    public byte run(byte[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_4.j
deleted file mode 100644
index 26e2c63..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_4.j
+++ /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_baload_4.java
-.class public dxc/junit/opcodes/baload/jm/T_baload_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([BD)B
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-;    d2i
-    baload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_4.java
deleted file mode 100644
index 17b9452..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_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 dxc.junit.opcodes.baload.jm;
-
-public class T_baload_4 {
-
-    public byte run(byte[] arr, double idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_5.j
deleted file mode 100644
index 821f3d6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_5.j
+++ /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_baload_5.java
-.class public dxc/junit/opcodes/baload/jm/T_baload_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([BJ)B
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    lload_2
-;    l2i
-    baload
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_5.java
deleted file mode 100644
index 0e033dc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_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 dxc.junit.opcodes.baload.jm;
-
-public class T_baload_5 {
-
-    public byte run(byte[] arr, long idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_6.j
deleted file mode 100644
index b02bf0d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_6.j
+++ /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_baload_6.java
-.class public dxc/junit/opcodes/baload/jm/T_baload_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;[BI)B
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_3
-
-    baload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_6.java
deleted file mode 100644
index 819ec21..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_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 dxc.junit.opcodes.baload.jm;
-
-public class T_baload_6 {
-
-    public byte run(Object a, byte[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_7.j b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_7.j
deleted file mode 100644
index 32607e2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_baload_7.java
-.class public dxc/junit/opcodes/baload/jm/T_baload_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([D[BI)B
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    baload
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_7.java b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_7.java
deleted file mode 100644
index af1d1af..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_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 dxc.junit.opcodes.baload.jm;
-
-public class T_baload_7 {
-
-    public byte run(double[] a, byte[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_8.j b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_8.j
deleted file mode 100644
index b7dd523..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_8.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_baload_8.java
-.class public dxc/junit/opcodes/baload/jm/T_baload_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([I[BI)B
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    baload
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_8.java b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_8.java
deleted file mode 100644
index eeb6197..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_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 dxc.junit.opcodes.baload.jm;
-
-public class T_baload_8 {
-
-    public byte run(int[] a, byte[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_9.j b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_9.j
deleted file mode 100644
index f47a328..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_9.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_baload_9.java
-.class public dxc/junit/opcodes/baload/jm/T_baload_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([BI)B
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    aload_0
-    baload
-
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_9.java b/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_9.java
deleted file mode 100644
index 9471c7a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/baload/jm/T_baload_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 dxc.junit.opcodes.baload.jm;
-
-public class T_baload_9 {
-    
-    public byte run(byte[] arr, int idx) {
-        return arr[idx];
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/Test_bastore.java b/tools/dx-tests/src/dxc/junit/opcodes/bastore/Test_bastore.java
deleted file mode 100644
index e183f0d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/Test_bastore.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 dxc.junit.opcodes.bastore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.bastore.jm.T_bastore_1;
-
-public class Test_bastore extends DxTestCase {
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN1() {
-        T_bastore_1 t = new T_bastore_1();
-        byte[] arr = new byte[2];
-        t.run(arr, 1, (byte) 100);
-        assertEquals(100, arr[1]);
-    }
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN2() {
-        T_bastore_1 t = new T_bastore_1();
-        byte[] arr = new byte[2];
-        t.run(arr, 0, (byte) 100);
-        assertEquals(100, arr[0]);
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_bastore_1 t = new T_bastore_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_bastore_1 t = new T_bastore_1();
-        try {
-            t.run(null, 2, (byte) 100);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_bastore_1 t = new T_bastore_1();
-        byte[] arr = new byte[2];
-        try {
-            t.run(arr, -1, (byte) 100);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.bastore.jm.T_bastore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.bastore.jm.T_bastore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double,
-     * short
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.bastore.jm.T_bastore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, int, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.bastore.jm.T_bastore_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - object, int,
-     * short
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.bastore.jm.T_bastore_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], int,
-     * short
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.bastore.jm.T_bastore_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int,
-     * short
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.bastore.jm.T_bastore_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference,
-     * short
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.bastore.jm.T_bastore_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_1.j
deleted file mode 100644
index 49c11df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_1.j
+++ /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_bastore_1.java
-.class public dxc/junit/opcodes/bastore/jm/T_bastore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([BIB)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    iload_3
-    bastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_1.java
deleted file mode 100644
index 82c22a5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_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 dxc.junit.opcodes.bastore.jm;
-
-public class T_bastore_1 {
-    public void run(byte[] arr, int idx, byte value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_2.j
deleted file mode 100644
index d67c623..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_2.j
+++ /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_bastore_2.java
-.class public dxc/junit/opcodes/bastore/jm/T_bastore_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([BIB)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    ;iload_3
-    bastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_2.java
deleted file mode 100644
index a34acf8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_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 dxc.junit.opcodes.bastore.jm;
-
-public class T_bastore_2 {
-
-    public void run(byte[] arr, int idx, byte value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_3.j
deleted file mode 100644
index 68920fb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_3.j
+++ /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_bastore_3.java
-.class public dxc/junit/opcodes/bastore/jm/T_bastore_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([BIB)V
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    iload_3
-    bastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_3.java
deleted file mode 100644
index 533b440..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_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 dxc.junit.opcodes.bastore.jm;
-
-public class T_bastore_3 {
-
-    public void run(byte[] arr, int idx, byte value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_4.j
deleted file mode 100644
index a4f8aaa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_4.j
+++ /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_bastore_4.java
-.class public dxc/junit/opcodes/bastore/jm/T_bastore_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([BDI)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-;    d2i
-    iload 4
-    bastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_4.java
deleted file mode 100644
index 6dbb401..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_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 dxc.junit.opcodes.bastore.jm;
-
-public class T_bastore_4 {
-
-    public void run(byte[] arr, double idx, byte value) {
-        arr[(int)idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_5.j
deleted file mode 100644
index 49c1303..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_5.j
+++ /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_bastore_5.java
-.class public dxc/junit/opcodes/bastore/jm/T_bastore_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([BIJ)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    iload_2
-    lload 3
-;   l2i
-;    i2s    
-    bastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_5.java
deleted file mode 100644
index af3fe81..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_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 dxc.junit.opcodes.bastore.jm;
-
-public class T_bastore_5 {
-
-    public void run(byte[] arr, int idx, long value) {
-        arr[idx] = (byte)value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_6.j b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_6.j
deleted file mode 100644
index e6ce2e0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_6.j
+++ /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_bastore_6.java
-.class public dxc/junit/opcodes/bastore/jm/T_bastore_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;IB)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    iload_3
-    bastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_6.java b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_6.java
deleted file mode 100644
index 4db5a94..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_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 dxc.junit.opcodes.bastore.jm;
-
-public class T_bastore_6 {
-
-    public void run(Object a, byte[] arr, int idx, byte value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_7.j b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_7.j
deleted file mode 100644
index 4470df9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_7.j
+++ /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_bastore_7.java
-.class public dxc/junit/opcodes/bastore/jm/T_bastore_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([D[BIB)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_3
-    iload 4
-    bastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_7.java b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_7.java
deleted file mode 100644
index d97dd1d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_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 dxc.junit.opcodes.bastore.jm;
-
-public class T_bastore_7 {
-
-    public void run(double a[], byte[] arr, int idx, byte value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_8.j b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_8.j
deleted file mode 100644
index 54feab5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_8.j
+++ /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_bastore_8.java
-.class public dxc/junit/opcodes/bastore/jm/T_bastore_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([J[BIB)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_3
-    iload 4
-    bastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_8.java b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_8.java
deleted file mode 100644
index 77b58c0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_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 dxc.junit.opcodes.bastore.jm;
-
-public class T_bastore_8 {
-
-    public void run(long a[], byte[] arr, int idx, byte value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_9.j b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_9.j
deleted file mode 100644
index f2f3ec3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_bastore_9.java
-.class public dxc/junit/opcodes/bastore/jm/T_bastore_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([BIB)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    aload_0
-    iload_3
-    bastore
-
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_9.java b/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_9.java
deleted file mode 100644
index 9b62a2c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bastore/jm/T_bastore_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 dxc.junit.opcodes.bastore.jm;
-
-public class T_bastore_9 {
-    
-    public void run(byte[] arr, int idx, byte value) {
-        arr[idx] = value;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bipush/Test_bipush.java b/tools/dx-tests/src/dxc/junit/opcodes/bipush/Test_bipush.java
deleted file mode 100644
index 2eb5bce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bipush/Test_bipush.java
+++ /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.
- */
-
-package dxc.junit.opcodes.bipush;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.bipush.jm.T_bipush_1;
-import dxc.junit.opcodes.bipush.jm.T_bipush_2;
-import dxc.junit.opcodes.bipush.jm.T_bipush_3;
-
-public class Test_bipush extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_bipush_1 t = new T_bipush_1();
-        assertEquals(100, t.run());
-    }
-
-    /**
-     * @title normal test
-     */
-    public void testB1() {
-        T_bipush_2 t = new T_bipush_2();
-        assertEquals(0, t.run());
-    }
-
-    /**
-     * @title normal test
-     */
-    public void testB2() {
-        T_bipush_3 t = new T_bipush_3();
-        assertEquals(-1, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.bipush.jm.T_bipush_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_1.j b/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_1.j
deleted file mode 100644
index 40d0a80..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_1.j
+++ /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_bipush_1.java
-.class public dxc/junit/opcodes/bipush/jm/T_bipush_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()B
-    bipush 100
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_1.java b/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_1.java
deleted file mode 100644
index 5c2667d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_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 dxc.junit.opcodes.bipush.jm;
-
-public class T_bipush_1 {
-
-    public byte run() {
-        return (byte)100;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_2.j b/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_2.j
deleted file mode 100644
index 17b6e3a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_bipush_2.java
-.class public dxc/junit/opcodes/bipush/jm/T_bipush_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()B
-    .limit stack 1
-    .limit locals 1
-
-    bipush 0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_2.java b/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_2.java
deleted file mode 100644
index 9b04e4d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_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 dxc.junit.opcodes.bipush.jm;
-
-public class T_bipush_2 {
-
-    public byte run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_3.j b/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_3.j
deleted file mode 100644
index 7e93411..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_3.j
+++ /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_bipush_3.java
-.class public dxc/junit/opcodes/bipush/jm/T_bipush_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()B
-    .limit stack 1
-    .limit locals 1
-
-    bipush -1
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_3.java b/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_3.java
deleted file mode 100644
index 0fad6c7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_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 dxc.junit.opcodes.bipush.jm;
-
-public class T_bipush_3 {
-
-    public byte run() {
-        return -1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_4.j b/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_4.j
deleted file mode 100644
index 0d9b7d9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_4.j
+++ /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_bipush_4.java
-.class public dxc/junit/opcodes/bipush/jm/T_bipush_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()B
-    .limit stack 1
-;    .limit locals 1
-
-    bipush 1
-    bipush 1
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_4.java b/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_4.java
deleted file mode 100644
index 4740577..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/bipush/jm/T_bipush_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 dxc.junit.opcodes.bipush.jm;
-
-public class T_bipush_4 {
-
-    public byte run() {
-        return 1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/Test_caload.java b/tools/dx-tests/src/dxc/junit/opcodes/caload/Test_caload.java
deleted file mode 100644
index 3db3080..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/Test_caload.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 dxc.junit.opcodes.caload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.caload.jm.T_caload_1;
-
-public class Test_caload extends DxTestCase {
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN1() {
-        T_caload_1 t = new T_caload_1();
-        char[] arr = new char[2];
-        arr[1] = 'g';
-        assertEquals('g', t.run(arr, 1));
-    }
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN2() {
-        T_caload_1 t = new T_caload_1();
-        char[] arr = new char[2];
-        arr[0] = 'g';
-        assertEquals('g', t.run(arr, 0));
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_caload_1 t = new T_caload_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_caload_1 t = new T_caload_1();
-        try {
-            t.run(null, 2);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_caload_1 t = new T_caload_1();
-        char[] arr = new char[2];
-        try {
-            t.run(arr, -1);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.caload.jm.T_caload_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.caload.jm.T_caload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.caload.jm.T_caload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.caload.jm.T_caload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - Object, char
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.caload.jm.T_caload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], char
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.caload.jm.T_caload_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int[], int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.caload.jm.T_caload_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.caload.jm.T_caload_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_1.j
deleted file mode 100644
index 3d541a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_1.j
+++ /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_caload_1.java
-.class public dxc/junit/opcodes/caload/jm/T_caload_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([CI)C
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-
-    caload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_1.java
deleted file mode 100644
index beb189c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_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 dxc.junit.opcodes.caload.jm;
-
-public class T_caload_1 {
-    public char run(char[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_2.j
deleted file mode 100644
index 9df1729..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_2.j
+++ /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_caload_2.java
-.class public dxc/junit/opcodes/caload/jm/T_caload_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([CI)C
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-;    iload_2
-
-    caload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_2.java
deleted file mode 100644
index fffa0bf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_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 dxc.junit.opcodes.caload.jm;
-
-public class T_caload_2 {
-
-    public char run(char[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_3.j
deleted file mode 100644
index 28233b4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_caload_3.java
-.class public dxc/junit/opcodes/caload/jm/T_caload_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([CI)C
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    caload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_3.java
deleted file mode 100644
index 4d12ec7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_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 dxc.junit.opcodes.caload.jm;
-
-public class T_caload_3 {
-
-    public char run(char[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_4.j
deleted file mode 100644
index 8d67495..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_4.j
+++ /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_caload_4.java
-.class public dxc/junit/opcodes/caload/jm/T_caload_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([CD)C
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-;    d2i
-    caload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_4.java
deleted file mode 100644
index 2e9c3e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_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 dxc.junit.opcodes.caload.jm;
-
-public class T_caload_4 {
-
-    public char run(char[] arr, double idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_5.j
deleted file mode 100644
index 9a3eb23..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_5.j
+++ /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_caload_5.java
-.class public dxc/junit/opcodes/caload/jm/T_caload_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([CJ)C
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    lload_2
-;    l2i
-    caload
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_5.java
deleted file mode 100644
index 2fde894..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_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 dxc.junit.opcodes.caload.jm;
-
-public class T_caload_5 {
-
-    public char run(char[] arr, long idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_6.j
deleted file mode 100644
index 549c5fc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_6.j
+++ /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_caload_6.java
-.class public dxc/junit/opcodes/caload/jm/T_caload_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;[CI)C
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_3
-
-    caload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_6.java
deleted file mode 100644
index c4b5fb1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_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 dxc.junit.opcodes.caload.jm;
-
-public class T_caload_6 {
-
-    public char run(Object a, char[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_7.j b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_7.j
deleted file mode 100644
index 9c7513a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_caload_7.java
-.class public dxc/junit/opcodes/caload/jm/T_caload_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([D[CI)C
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    caload
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_7.java b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_7.java
deleted file mode 100644
index 0b93a7d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_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 dxc.junit.opcodes.caload.jm;
-
-public class T_caload_7 {
-
-    public char run(double[] a, char[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_8.j b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_8.j
deleted file mode 100644
index 34f05f1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_8.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_caload_8.java
-.class public dxc/junit/opcodes/caload/jm/T_caload_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([I[CI)C
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    caload
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_8.java b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_8.java
deleted file mode 100644
index 41c435d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_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 dxc.junit.opcodes.caload.jm;
-
-public class T_caload_8 {
-
-    public char run(int[] a, char[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_9.j b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_9.j
deleted file mode 100644
index d0489ae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_9.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_caload_9.java
-.class public dxc/junit/opcodes/caload/jm/T_caload_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([CI)C
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    aload_0
-    caload
-
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_9.java b/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_9.java
deleted file mode 100644
index c5c29e6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/caload/jm/T_caload_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 dxc.junit.opcodes.caload.jm;
-
-public class T_caload_9 {
-    
-    public char run(char[] arr, int idx) {
-        return arr[idx];
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/Test_castore.java b/tools/dx-tests/src/dxc/junit/opcodes/castore/Test_castore.java
deleted file mode 100644
index c427cd6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/Test_castore.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 dxc.junit.opcodes.castore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.castore.jm.T_castore_1;
-
-public class Test_castore extends DxTestCase {
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN1() {
-        T_castore_1 t = new T_castore_1();
-        char[] arr = new char[2];
-        t.run(arr, 1, 'g');
-        assertEquals('g', arr[1]);
-    }
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN2() {
-        T_castore_1 t = new T_castore_1();
-        char[] arr = new char[2];
-        t.run(arr, 0, 'g');
-        assertEquals('g', arr[0]);
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_castore_1 t = new T_castore_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_castore_1 t = new T_castore_1();
-        try {
-            t.run(null, 2, 'g');
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_castore_1 t = new T_castore_1();
-        char[] arr = new char[2];
-        try {
-            t.run(arr, -1, 'g');
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.castore.jm.T_castore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.castore.jm.T_castore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double,
-     * char
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.castore.jm.T_castore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, int, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.castore.jm.T_castore_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - object, int, char
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.castore.jm.T_castore_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], int,
-     * char
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.castore.jm.T_castore_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int, char
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.castore.jm.T_castore_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference,
-     * char
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.castore.jm.T_castore_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_1.j
deleted file mode 100644
index 5936fc5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_1.j
+++ /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_castore_1.java
-.class public dxc/junit/opcodes/castore/jm/T_castore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([CIC)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    iload_3
-    castore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_1.java
deleted file mode 100644
index 011ac3b6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_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 dxc.junit.opcodes.castore.jm;
-
-public class T_castore_1 {
-    public void run(char[] arr, int idx, char value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_2.j
deleted file mode 100644
index 6589661..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_2.j
+++ /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_castore_2.java
-.class public dxc/junit/opcodes/castore/jm/T_castore_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([CIC)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    ;iload_3
-    castore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_2.java
deleted file mode 100644
index b04e352..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_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 dxc.junit.opcodes.castore.jm;
-
-public class T_castore_2 {
-
-    public void run(char[] arr, int idx, char value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_3.j
deleted file mode 100644
index 2253cc7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_3.j
+++ /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_castore_3.java
-.class public dxc/junit/opcodes/castore/jm/T_castore_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([CIC)V
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    iload_3
-    castore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_3.java
deleted file mode 100644
index 55be405..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_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 dxc.junit.opcodes.castore.jm;
-
-public class T_castore_3 {
-
-    public void run(char[] arr, int idx, char value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_4.j
deleted file mode 100644
index 11c390f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_4.j
+++ /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_castore_4.java
-.class public dxc/junit/opcodes/castore/jm/T_castore_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([CDC)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-;    d2i
-    iload 4
-    castore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_4.java
deleted file mode 100644
index 3666fa1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_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 dxc.junit.opcodes.castore.jm;
-
-public class T_castore_4 {
-
-    public void run(char[] arr, double idx, char value) {
-        arr[(int)idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_5.j
deleted file mode 100644
index 3cfa149..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_5.j
+++ /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_castore_5.java
-.class public dxc/junit/opcodes/castore/jm/T_castore_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([CIJ)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    iload_2
-    lload 3
-;   l2i
-;    i2s    
-    castore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_5.java
deleted file mode 100644
index 1d43a3d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_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 dxc.junit.opcodes.castore.jm;
-
-public class T_castore_5 {
-
-    public void run(char[] arr, int idx, long value) {
-        arr[idx] = (char)value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_6.j b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_6.j
deleted file mode 100644
index f5caba3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_6.j
+++ /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_castore_6.java
-.class public dxc/junit/opcodes/castore/jm/T_castore_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;IC)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    iload_3
-    castore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_6.java b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_6.java
deleted file mode 100644
index 57ad883..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_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 dxc.junit.opcodes.castore.jm;
-
-public class T_castore_6 {
-
-    public void run(Object a, char[] arr, int idx, char value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_7.j b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_7.j
deleted file mode 100644
index 81a790e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_7.j
+++ /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_castore_7.java
-.class public dxc/junit/opcodes/castore/jm/T_castore_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([D[CIC)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_3
-    iload 4
-    castore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_7.java b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_7.java
deleted file mode 100644
index 62418ca..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_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 dxc.junit.opcodes.castore.jm;
-
-public class T_castore_7 {
-
-    public void run(double a[], char[] arr, int idx, char value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_8.j b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_8.j
deleted file mode 100644
index 8e33f1f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_8.j
+++ /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_castore_8.java
-.class public dxc/junit/opcodes/castore/jm/T_castore_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([J[CIC)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_3
-    iload 4
-    castore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_8.java b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_8.java
deleted file mode 100644
index d5bfaba..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_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 dxc.junit.opcodes.castore.jm;
-
-public class T_castore_8 {
-
-    public void run(long a[], char[] arr, int idx, char value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_9.j b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_9.j
deleted file mode 100644
index 955dc0e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_castore_9.java
-.class public dxc/junit/opcodes/castore/jm/T_castore_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([CIC)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    aload_0
-    iload_3
-    castore
-
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_9.java b/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_9.java
deleted file mode 100644
index 097fcfc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/castore/jm/T_castore_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 dxc.junit.opcodes.castore.jm;
-
-public class T_castore_9 {
-    
-    public void run(char[] arr, int idx, char value) {
-        arr[idx] = value;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/Test_checkcast.java b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/Test_checkcast.java
deleted file mode 100644
index a6f2350..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/Test_checkcast.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 dxc.junit.opcodes.checkcast;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.checkcast.jm.T_checkcast_1;
-import dxc.junit.opcodes.checkcast.jm.T_checkcast_2;
-import dxc.junit.opcodes.checkcast.jm.T_checkcast_3;
-import dxc.junit.opcodes.checkcast.jm.T_checkcast_7;
-
-public class Test_checkcast extends DxTestCase {
-    
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_checkcast_1 t = new T_checkcast_1();
-        String s = "";
-        assertEquals(s, t.run(s));
-    }
-
-    /**
-     * @title check null value
-     */
-    public void testN2() {
-        T_checkcast_1 t = new T_checkcast_1();
-        assertNull(t.run(null));
-    }
-
-    /**
-     * @title normal class
-     */
-    public void testN4() {
-        // @uses dxc.junit.opcodes.checkcast.jm.SubClass
-        // @uses dxc.junit.opcodes.checkcast.jm.SuperClass
-        // @uses dxc.junit.opcodes.checkcast.jm.SuperInterface
-        // @uses dxc.junit.opcodes.checkcast.jm.SuperInterface2
-        
-        T_checkcast_2 t = new T_checkcast_2();
-        assertEquals(5, t.run());
-    }
-
-    /**
-     * @title expected ClassCastException
-     */
-    public void testE1() {
-        T_checkcast_1 t = new T_checkcast_1();
-        try {
-            t.run(this);
-            fail("expected ClassCastException");
-        } catch (ClassCastException iae) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ClassCastException. checkcast [[[Ldxc/junit/opcodes/checkcast/jm/TestStubs$TestStub;
-     * dalvikvm throws ClassCastException as demanded by checkcast, but
-     * does not claim a IllegalAccessError to a private class - ok, 
-     * since checkcast does what the spec says it should do.
-     */
-    public void testE2() {
-        // @uses dxc.junit.opcodes.checkcast.jm.TestStubs$TestStub
-        try {
-            T_checkcast_3 t = new T_checkcast_3();
-            t.run();
-            fail("expected ClassCastException");
-        } catch (ClassCastException cce) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected NoClassDefFoundError
-     */
-    public void testE3() {
-        try {
-            T_checkcast_7 t = new T_checkcast_7();
-            t.run();
-            fail("expected NoClassDefFoundError");
-        } catch (NoClassDefFoundError iae) {
-            // expected
-        } catch (VerifyError vfe) {
-            // ok for dalvikvm; early resolution
-            System.out.print("dvmvfe:");
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.16
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.checkcast.jm.T_checkcast_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.checkcast.jm.T_checkcast_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.checkcast.jm.T_checkcast_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.16
-     * @title constant pool type
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.checkcast.jm.T_checkcast_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_1.j b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_1.j
deleted file mode 100644
index 2efe0d6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_1.j
+++ /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 T_checkcast_1.java
-.class public dxc/junit/opcodes/checkcast/jm/T_checkcast_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;)Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-    aload_1
-    checkcast java/lang/String
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_1.java b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_1.java
deleted file mode 100644
index c416457..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_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 dxc.junit.opcodes.checkcast.jm;
-
-public class T_checkcast_1 {
-
-    public String run(Object o) {
-        return (String)o;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_2.j b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_2.j
deleted file mode 100644
index 01d2e59..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_2.j
+++ /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.
-
-.source T_checkcast_2.java
-.class public dxc/junit/opcodes/checkcast/jm/T_checkcast_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 20
-    .limit locals 2
-    
-    iconst_0
-    istore_1
-    
-; (SubClass instanceof SuperClass)    
-    new        dxc/junit/opcodes/checkcast/jm/SubClass
-    dup
-    invokespecial dxc/junit/opcodes/checkcast/jm/SubClass.<init>()V
-    checkcast dxc/junit/opcodes/checkcast/jm/SuperClass
-    pop
-    
-; (SubClass[] instanceof SuperClass[])    
-    iconst_1
-    anewarray dxc/junit/opcodes/checkcast/jm/SubClass
-    checkcast [Ldxc/junit/opcodes/checkcast/jm/SuperClass;
-    pop    
-    
-; (SubClass[] instanceof Object)    
-    iconst_1
-    anewarray dxc/junit/opcodes/checkcast/jm/SubClass
-    checkcast java/lang/Object
-    pop
-    
-; (SubClass instanceof SuperInterface)    
-    new dxc/junit/opcodes/checkcast/jm/SubClass
-    dup
-    invokespecial dxc/junit/opcodes/checkcast/jm/SubClass.<init>()V    
-    checkcast dxc/junit/opcodes/checkcast/jm/SuperInterface
-    pop
-        
-
-; !(SuperClass instanceof SubClass)    
-Label1:
-    new dxc/junit/opcodes/checkcast/jm/SuperClass
-    dup
-    invokespecial dxc/junit/opcodes/checkcast/jm/SuperClass.<init>()V
-Label10:    
-    checkcast dxc/junit/opcodes/checkcast/jm/SubClass
-    pop
-Label11:    
-    goto Label2
-Label12:
-    pop
-    iinc 1 1
-    goto Label2
-        
-; !(SubClass instanceof SuperInterface2)    
-Label2:
-    new dxc/junit/opcodes/checkcast/jm/SubClass
-    dup
-    invokespecial dxc/junit/opcodes/checkcast/jm/SubClass.<init>()V    
-Label20:    
-    checkcast dxc/junit/opcodes/checkcast/jm/SuperInterface2
-    pop
-Label21:    
-    goto Label3
-Label22:
-    pop
-    iinc 1 1
-    goto Label3
-
-; !(SubClass[] instanceof SuperInterface)    
-Label3:
-    iconst_1
-    anewarray dxc/junit/opcodes/checkcast/jm/SubClass
-Label30:    
-    checkcast dxc/junit/opcodes/checkcast/jm/SuperInterface
-    pop
-Label31:    
-    goto Label4
-Label32:    
-    pop
-    iinc 1 1
-    goto Label4
-
-; !(SubClass[] instanceof SubClass)    
-Label4:
-    iconst_1
-    anewarray dxc/junit/opcodes/checkcast/jm/SubClass
-Label40:    
-    checkcast dxc/junit/opcodes/checkcast/jm/SubClass
-    pop
-Label41:    
-    goto Label5
-Label42:
-    pop
-    iinc 1 1
-    goto Label5    
-    
-; !(SuperClass[] instanceof SubClass[])    
-Label5:
-    iconst_1
-    anewarray dxc/junit/opcodes/checkcast/jm/SuperClass
-Label50:    
-    checkcast [Ldxc/junit/opcodes/checkcast/jm/SubClass;
-    pop
-Label51:    
-    goto Label6
-Label52:
-    pop
-    iinc 1 1
-    
-Label6:        
-    iload_1
-    ireturn
-    
-.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/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_2.java b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_2.java
deleted file mode 100644
index 08b8ec8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_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 dxc.junit.opcodes.checkcast.jm;
-
-public class T_checkcast_2 {
-
-    public int run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_3.j b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_3.j
deleted file mode 100644
index 84ec459..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_checkcast_3.java
-.class public dxc/junit/opcodes/checkcast/jm/T_checkcast_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 3
-    .limit locals 4
-    aload_0
-    checkcast [[[Ldxc/junit/opcodes/checkcast/jm/TestStubs$TestStub;
-    pop
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_3.java b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_3.java
deleted file mode 100644
index c9c5652..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_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 dxc.junit.opcodes.checkcast.jm;
-
-public class T_checkcast_3 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_4.cfh
deleted file mode 100644
index 27a40ce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_4.cfh
+++ /dev/null
@@ -1,191 +0,0 @@
-//@class:dxc/junit/opcodes/checkcast/jm/T_checkcast_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0010
-// .  .  
-   00 10 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0f 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 19, h: 0004: utf8{"java/lang/String"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 
-    // parsed:, offset 66, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 75, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 81, len 47, h: 0007: utf8{"dxc/junit/opcodes/checkcast/jm/T_checkcast_4"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  c  h  e  c  k  c  a  s  t  /  j  m  /  T  _  c  h  e  c  k  c  a  s  t  _  4  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 63 68 65 63 6b 63 61 73 74 2f 6a 6d 2f 54 5f 63 68 65 63 6b 63 61 73 74 5f 34 
-    // parsed:, offset 128, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0d 
-    // parsed:, offset 133, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 140, len 21, h: 000a: utf8{"T_checkcast_4.java"}
-    // .  .  .  T  _  c  h  e  c  k  c  a  s  t  _  4  .  j  a  v  a  
-       01 00 12 54 5f 63 68 65 63 6b 63 61 73 74 5f 34 2e 6a 61 76 61 
-    // parsed:, offset 161, len 3, h: 000b: type{java.lang.String}
-    // .  .  .  
-       07 00 04 
-    // parsed:, offset 164, len 41, h: 000c: utf8{"(Ljava/lang/Object;)Ljava/lang/String;"}
-    // .  .  &  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  
-       01 00 26 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 
-    // parsed:, offset 205, len 6, h: 000d: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 211, len 3, h: 000e: type{dxc.junit.opcodes.checkcast.jm.T_checkcast_4}
-    // .  .  .  
-       07 00 07 
-    // parsed:, offset 214, len 3, h: 000f: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 217, len 0, h: end constant_pool
-// parsed:, offset 217, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 219, len 2, h: this_class: type{dxc.junit.opcodes.checkcast.jm.T_checkcast_4}
-// .  .  
-   00 0e 
-// parsed:, offset 221, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0f 
-// parsed:, offset 223, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 225, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 227, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 229, len:72,desc: ()V
-// parsed:, offset 229, len 0, h:  methods[0]: 
-    // parsed:, offset 229, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 231, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 233, len 2, h: descriptor: ()V
-    // .  .  
-       00 0d 
-    // parsed:, offset 235, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 237, len 0, h:  attributes[0]: 
-        // parsed:, offset 237, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 239, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 243, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 245, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 247, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 256, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 258, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 260, len 0, h: end attributes[0] 
-// parsed:, offset 260, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 260, len:41,desc: (Ljava/lang/Object;)Ljava/lang/String;
-// parsed:, offset 260, len 0, h:  methods[1]: 
-    // parsed:, offset 260, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 262, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 264, len 2, h: descriptor: (Ljava/lang/Object;)Ljava/lang/String;
-    // .  .  
-       00 0c 
-    // parsed:, offset 266, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 268, len 0, h:  attributes[0]: 
-        // parsed:, offset 268, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 270, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 274, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 276, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 278, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 3, h: 0001: checkcast type{java.lang.String}
-        // .  .  .  
-//@mod           c0 00 0b 
-           c0 01 0b 
-        // parsed:, offset 4, len 1, h: 0004: areturn
-        // .  
-           b0 
-        // parsed:, offset 287, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 289, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 291, len 0, h: end attributes[0] 
-// parsed:, offset 291, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/Object;)Ljava/lang/String;
-// parsed:, offset 291, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 293, len 0, h:  attributes[0]: 
-    // parsed:, offset 293, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 295, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 299, len 2, h: source: utf8{"T_checkcast_4.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 301, len 0, h: end attributes[0] 
-// parsed:, offset 301, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_4.j b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_4.j
deleted file mode 100644
index 9066302..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_4.j
+++ /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 T_checkcast_4.java
-.class public dxc/junit/opcodes/checkcast/jm/T_checkcast_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;)Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-    aload_1
-    checkcast java/lang/String
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_4.java b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_4.java
deleted file mode 100644
index e5d5fbc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_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 dxc.junit.opcodes.checkcast.jm;
-
-public class T_checkcast_4 {
-
-    public String run(Object o) {
-        return (String)o;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_5.j b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_5.j
deleted file mode 100644
index b4e645b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_5.j
+++ /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 T_checkcast_5.java
-.class public dxc/junit/opcodes/checkcast/jm/T_checkcast_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;)Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-    fconst_1
-    checkcast java/lang/String
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_5.java b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_5.java
deleted file mode 100644
index afb4ba2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_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 dxc.junit.opcodes.checkcast.jm;
-
-public class T_checkcast_5 {
-
-    public String run(Object o) {
-        return (String)o;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_6.j b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_6.j
deleted file mode 100644
index 7ae206c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_6.j
+++ /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 T_checkcast_6.java
-.class public dxc/junit/opcodes/checkcast/jm/T_checkcast_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;)Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-;    aload_1
-    checkcast java/lang/String
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_6.java b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_6.java
deleted file mode 100644
index 6389d85..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_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 dxc.junit.opcodes.checkcast.jm;
-
-public class T_checkcast_6 {
-
-    public String run(Object o) {
-        return (String)o;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_7.j b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_7.j
deleted file mode 100644
index b3ad568..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_7.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_checkcast_7.java
-.class public dxc/junit/opcodes/checkcast/jm/T_checkcast_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 3
-    .limit locals 4
-    aload_0
-    checkcast [[[Ldxc/junit/opcodes/checkcast/jm/foobar1;
-    pop
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_7.java b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_7.java
deleted file mode 100644
index 98167f1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_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 dxc.junit.opcodes.checkcast.jm;
-
-public class T_checkcast_7 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_8.cfh b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_8.cfh
deleted file mode 100644
index fa33a5f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_8.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/checkcast/jm/T_checkcast_8
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0011
-// .  .  
-   00 11 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 10 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 3, h: 0003: type{java.lang.String}
-    // .  .  .  
-       07 00 0c 
-    // parsed:, offset 37, len 47, h: 0004: utf8{"dxc/junit/opcodes/checkcast/jm/T_checkcast_8"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  c  h  e  c  k  c  a  s  t  /  j  m  /  T  _  c  h  e  c  k  c  a  s  t  _  8  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 63 68 65 63 6b 63 61 73 74 2f 6a 6d 2f 54 5f 63 68 65 63 6b 63 61 73 74 5f 38 
-    // parsed:, offset 84, len 13, h: 0005: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 97, len 5, h: 0006: int{0x0000007b / 123}
-    // .  .  .  .  {  
-       03 00 00 00 7b 
-    // parsed:, offset 102, len 9, h: 0007: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 111, len 6, h: 0008: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 117, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 07 00 0e 
-    // parsed:, offset 122, len 21, h: 000a: utf8{"T_checkcast_8.java"}
-    // .  .  .  T  _  c  h  e  c  k  c  a  s  t  _  8  .  j  a  v  a  
-       01 00 12 54 5f 63 68 65 63 6b 63 61 73 74 5f 38 2e 6a 61 76 61 
-    // parsed:, offset 143, len 7, h: 000b: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 150, len 19, h: 000c: utf8{"java/lang/String"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 
-    // parsed:, offset 169, len 41, h: 000d: utf8{"(Ljava/lang/Object;)Ljava/lang/String;"}
-    // .  .  &  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  
-       01 00 26 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 
-    // parsed:, offset 210, len 6, h: 000e: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 216, len 3, h: 000f: type{dxc.junit.opcodes.checkcast.jm.T_checkcast_8}
-    // .  .  .  
-       07 00 04 
-    // parsed:, offset 219, len 3, h: 0010: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 222, len 0, h: end constant_pool
-// parsed:, offset 222, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 224, len 2, h: this_class: type{dxc.junit.opcodes.checkcast.jm.T_checkcast_8}
-// .  .  
-   00 0f 
-// parsed:, offset 226, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 10 
-// parsed:, offset 228, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 230, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 232, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 234, len:75,desc: ()V
-// parsed:, offset 234, len 0, h:  methods[0]: 
-    // parsed:, offset 234, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 236, len 2, h: name: <init>
-    // .  .  
-       00 07 
-    // parsed:, offset 238, len 2, h: descriptor: ()V
-    // .  .  
-       00 0e 
-    // parsed:, offset 240, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 242, len 0, h:  attributes[0]: 
-        // parsed:, offset 242, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 244, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 248, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 250, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 252, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 261, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 263, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 265, len 0, h: end attributes[0] 
-// parsed:, offset 265, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 265, len:44,desc: (Ljava/lang/Object;)Ljava/lang/String;
-// parsed:, offset 265, len 0, h:  methods[1]: 
-    // parsed:, offset 265, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 267, len 2, h: name: run
-    // .  .  
-       00 08 
-    // parsed:, offset 269, len 2, h: descriptor: (Ljava/lang/Object;)Ljava/lang/String;
-    // .  .  
-       00 0d 
-    // parsed:, offset 271, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 273, len 0, h:  attributes[0]: 
-        // parsed:, offset 273, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 275, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 279, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 281, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 283, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 2, h: 0000: ldc #+0000007b
-        // .  .  
-           12 06 
-        // parsed:, offset 2, len 1, h: 0002: pop
-        // W  
-           57 
-        // parsed:, offset 3, len 1, h: 0003: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 4, len 3, h: 0004: checkcast type{java.lang.String}
-        // .  .  .  
-//@mod           c0 00 03 
-           c0 00 06 
-        // parsed:, offset 7, len 1, h: 0007: areturn
-        // .  
-           b0 
-        // parsed:, offset 295, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 297, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 299, len 0, h: end attributes[0] 
-// parsed:, offset 299, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/Object;)Ljava/lang/String;
-// parsed:, offset 299, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 301, len 0, h:  attributes[0]: 
-    // parsed:, offset 301, len 2, h: name: SourceFile
-    // .  .  
-       00 05 
-    // parsed:, offset 303, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 307, len 2, h: source: utf8{"T_checkcast_8.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 309, len 0, h: end attributes[0] 
-// parsed:, offset 309, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_8.j b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_8.j
deleted file mode 100644
index bf537de..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_8.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_checkcast_8.java
-.class public dxc/junit/opcodes/checkcast/jm/T_checkcast_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;)Ljava/lang/String;
-    .limit stack 1
-    .limit locals 2
-    
-    ldc 123
-    pop
-    
-    aload_1
-    checkcast java/lang/String
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_8.java b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_8.java
deleted file mode 100644
index cce0c88..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/T_checkcast_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 dxc.junit.opcodes.checkcast.jm;
-
-public class T_checkcast_8 {
-
-    public String run(Object o) {
-        return (String)o;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/TestStubs.java
deleted file mode 100644
index 97476a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/checkcast/jm/TestStubs.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 dxc.junit.opcodes.checkcast.jm;
-
-
-public class TestStubs {
-    @SuppressWarnings("unused")
-    private class TestStub {
-        // testE2
-    }
-}
-
-interface SuperInterface{
-    
-}
-
-interface SuperInterface2{
-    
-}
-
-class SuperClass implements SuperInterface{
-    
-}
-
-class SubClass extends SuperClass{
-
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/Test_d2f.java b/tools/dx-tests/src/dxc/junit/opcodes/d2f/Test_d2f.java
deleted file mode 100644
index 3571b8a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/Test_d2f.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 dxc.junit.opcodes.d2f;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.d2f.jm.T_d2f_1;
-
-public class Test_d2f extends DxTestCase {
-
-    /**
-     * @title  Argument = 2.71
-     */
-    public void testN1() {
-        T_d2f_1 t = new T_d2f_1();
-        assertEquals(2.71f, t.run(2.71d));
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_d2f_1 t = new T_d2f_1();
-        assertEquals(1f, t.run(1d));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_d2f_1 t = new T_d2f_1();
-        assertEquals(-1f, t.run(-1d));
-    }
-
-    /**
-     * @title  Argument = Double.MAX_VALUE
-     */
-    public void testB1() {
-        T_d2f_1 t = new T_d2f_1();
-        assertEquals(Float.POSITIVE_INFINITY, t.run(Double.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Double.MIN_VALUE
-     */
-    public void testB2() {
-        T_d2f_1 t = new T_d2f_1();
-        assertEquals(0f, t.run(Double.MIN_VALUE));
-    }
-
-    /**
-     * @title  Argument = -0
-     */
-    public void testB3() {
-        T_d2f_1 t = new T_d2f_1();
-        assertEquals(-0f, t.run(-0d));
-    }
-
-    /**
-     * @title  Argument = NaN
-     */
-    public void testB4() {
-        T_d2f_1 t = new T_d2f_1();
-        assertTrue(Float.isNaN(t.run(Double.NaN)));
-    }
-
-    /**
-     * @title  Argument = POSITIVE_INFINITY
-     */
-    public void testB5() {
-        T_d2f_1 t = new T_d2f_1();
-        assertTrue(Float.isInfinite(t.run(Double.POSITIVE_INFINITY)));
-    }
-
-    /**
-     * @title  Argument = NEGATIVE_INFINITY
-     */
-    public void testB6() {
-        T_d2f_1 t = new T_d2f_1();
-        assertTrue(Float.isInfinite(t.run(Double.NEGATIVE_INFINITY)));
-    }
-
-
-    /**
-     * @title  Argument = -Double.MIN_VALUE
-     */
-    public void testB7() {
-        T_d2f_1 t = new T_d2f_1();
-        assertEquals(-0f, t.run(-4.9E-324d));
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2f.jm.T_d2f_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2f.jm.T_d2f_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2f.jm.T_d2f_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2f.jm.T_d2f_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_1.j b/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_1.j
deleted file mode 100644
index 461f86a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_1.j
+++ /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 T_d2f_1.java
-.class public dxc/junit/opcodes/d2f/jm/T_d2f_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)F
-    .limit stack 3
-    .limit locals 3
-    dload_1
-    d2f
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_1.java b/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_1.java
deleted file mode 100644
index e63f2c4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_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 dxc.junit.opcodes.d2f.jm;
-
-public class T_d2f_1 {
-
-    public float run(double a) {
-        return (float)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_2.j b/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_2.j
deleted file mode 100644
index a65c7ce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_2.j
+++ /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_d2f_2.java
-.class public dxc/junit/opcodes/d2f/jm/T_d2f_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(D)F
-    .limit stack 3
-    .limit locals 3
-
-;    dload_1
-    d2f
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_2.java b/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_2.java
deleted file mode 100644
index 5dca9a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_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 dxc.junit.opcodes.d2f.jm;
-
-public class T_d2f_2 {
-
-    public float run(double a) {
-        return (float)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_3.j b/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_3.j
deleted file mode 100644
index 4c02168..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_3.j
+++ /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_d2f_3.java
-.class public dxc/junit/opcodes/d2f/jm/T_d2f_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(F)F
-    .limit stack 2
-    .limit locals 3
-
-    fload_1
-    d2f
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_3.java b/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_3.java
deleted file mode 100644
index 6be1325..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_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 dxc.junit.opcodes.d2f.jm;
-
-public class T_d2f_3 {
-
-    public float run(float a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_4.j b/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_4.j
deleted file mode 100644
index dc79276..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_d2f_4.java
-.class public dxc/junit/opcodes/d2f/jm/T_d2f_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(J)D
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-    d2f
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_4.java b/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_4.java
deleted file mode 100644
index 240dfea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_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 dxc.junit.opcodes.d2f.jm;
-
-public class T_d2f_4 {
-
-    public float run(long a) {
-        return (float) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_5.j b/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_5.j
deleted file mode 100644
index c743637..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_5.j
+++ /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_d2f_5.java
-.class public dxc/junit/opcodes/d2f/jm/T_d2f_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)F
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    d2f
-    freturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_5.java b/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_5.java
deleted file mode 100644
index b9a986b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2f/jm/T_d2f_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 dxc.junit.opcodes.d2f.jm;
-
-public class T_d2f_5 {
-    
-    public float run(double a) {
-        return (float)a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/Test_d2i.java b/tools/dx-tests/src/dxc/junit/opcodes/d2i/Test_d2i.java
deleted file mode 100644
index a316201..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/Test_d2i.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.d2i;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.d2i.jm.T_d2i_1;
-
-public class Test_d2i extends DxTestCase {
-
-    /**
-     * @title  Argument = 2.9999999d
-     */
-    public void testN1() {
-        T_d2i_1 t = new T_d2i_1();
-        assertEquals(2, t.run(2.9999999d));
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_d2i_1 t = new T_d2i_1();
-        assertEquals(1, t.run(1d));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_d2i_1 t = new T_d2i_1();
-        assertEquals(-1, t.run(-1d));
-    }
-
-    /**
-     * @title  Argument = -0
-     */
-    public void testB1() {
-        T_d2i_1 t = new T_d2i_1();
-        assertEquals(0, t.run(-0d));
-    }
-
-    /**
-     * @title  Argument = Double.MAX_VALUE
-     */
-    public void testB2() {
-        T_d2i_1 t = new T_d2i_1();
-        assertEquals(Integer.MAX_VALUE, t.run(Double.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Double.MIN_VALUE
-     */
-    public void testB3() {
-        T_d2i_1 t = new T_d2i_1();
-        assertEquals(0, t.run(Double.MIN_VALUE));
-    }
-
-    /**
-     * @title  Argument = NaN
-     */
-    public void testB4() {
-        T_d2i_1 t = new T_d2i_1();
-        assertEquals(0, t.run(Double.NaN));
-    }
-
-    /**
-     * @title  Argument = POSITIVE_INFINITY
-     */
-    public void testB5() {
-        T_d2i_1 t = new T_d2i_1();
-        assertEquals(Integer.MAX_VALUE, t.run(Double.POSITIVE_INFINITY));
-    }
-
-    /**
-     * @title  Argument = NEGATIVE_INFINITY
-     */
-    public void testB6() {
-        T_d2i_1 t = new T_d2i_1();
-        assertEquals(Integer.MIN_VALUE, t.run(Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2i.jm.T_d2i_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2i.jm.T_d2i_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2i.jm.T_d2i_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2i.jm.T_d2i_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_1.j b/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_1.j
deleted file mode 100644
index d14f823..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_1.j
+++ /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 T_d2i_1.java
-.class public dxc/junit/opcodes/d2i/jm/T_d2i_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)I
-    .limit stack 3
-    .limit locals 3
-    dload_1
-    d2i
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_1.java b/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_1.java
deleted file mode 100644
index 5d55cac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_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 dxc.junit.opcodes.d2i.jm;
-
-public class T_d2i_1 {
-
-    public int run(double a) {
-        return (int)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_2.j b/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_2.j
deleted file mode 100644
index f0bd798..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_2.j
+++ /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_d2i_2.java
-.class public dxc/junit/opcodes/d2i/jm/T_d2i_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(D)I
-    .limit stack 3
-    .limit locals 3
-
-;    dload_1
-    d2i
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_2.java b/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_2.java
deleted file mode 100644
index 6228cc3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_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 dxc.junit.opcodes.d2i.jm;
-
-public class T_d2i_2 {
-
-    public int run(double a) {
-        return (int)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_3.j b/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_3.j
deleted file mode 100644
index d9be73a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_3.j
+++ /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_d2i_3.java
-.class public dxc/junit/opcodes/d2i/jm/T_d2i_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(F)I
-    .limit stack 2
-    .limit locals 3
- 
-    fload_1
- ;   d2f
-     d2i
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_3.java b/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_3.java
deleted file mode 100644
index a83ae18..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_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 dxc.junit.opcodes.d2i.jm;
-
-public class T_d2i_3 {
-
-    public int run(float a) {
-        return (int)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_4.j b/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_4.j
deleted file mode 100644
index beb0d2f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_4.j
+++ /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_d2i_4.java
-.class public dxc/junit/opcodes/d2i/jm/T_d2i_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(J)I
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-
-    ;l2f
-    d2i
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_4.java b/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_4.java
deleted file mode 100644
index 78aba37..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_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 dxc.junit.opcodes.d2i.jm;
-
-public class T_d2i_4 {
-
-    public int run(long a) {
-        return (int)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_5.j b/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_5.j
deleted file mode 100644
index 9816ceb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_5.j
+++ /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_d2i_5.java
-.class public dxc/junit/opcodes/d2i/jm/T_d2i_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    d2i
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_5.java b/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_5.java
deleted file mode 100644
index cf5b3ec..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2i/jm/T_d2i_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 dxc.junit.opcodes.d2i.jm;
-
-public class T_d2i_5 {
-    
-    public int run(double a) {
-        return (int)a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/Test_d2l.java b/tools/dx-tests/src/dxc/junit/opcodes/d2l/Test_d2l.java
deleted file mode 100644
index d1bbd05..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/Test_d2l.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.d2l;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.d2l.jm.T_d2l_1;
-
-public class Test_d2l extends DxTestCase {
-
-    /**
-     * @title  Argument = 2.9999999
-     */
-    public void testN1() {
-        T_d2l_1 t = new T_d2l_1();
-        assertEquals(2l, t.run(2.9999999d));
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_d2l_1 t = new T_d2l_1();
-        assertEquals(1l, t.run(1d));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_d2l_1 t = new T_d2l_1();
-        assertEquals(-1l, t.run(-1d));
-    }
-
-    /**
-     * @title  Argument = Double.MAX_VALUE
-     */
-    public void testB1() {
-        T_d2l_1 t = new T_d2l_1();
-        assertEquals(Long.MAX_VALUE, t.run(Double.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Double.MIN_VALUE
-     */
-    public void testB2() {
-        T_d2l_1 t = new T_d2l_1();
-        assertEquals(0, t.run(Double.MIN_VALUE));
-    }
-
-    /**
-     * @title  Argument = -0
-     */
-    public void testB3() {
-        T_d2l_1 t = new T_d2l_1();
-        assertEquals(0l, t.run(-0));
-    }
-
-    /**
-     * @title  Argument = NaN
-     */
-    public void testB4() {
-        T_d2l_1 t = new T_d2l_1();
-        assertEquals(0l, t.run(Double.NaN));
-    }
-
-    /**
-     * @title  Argument = POSITIVE_INFINITY
-     */
-    public void testB5() {
-        T_d2l_1 t = new T_d2l_1();
-        assertEquals(Long.MAX_VALUE, t.run(Double.POSITIVE_INFINITY));
-    }
-
-    /**
-     * @title  Argument = NEGATIVE_INFINITY
-     */
-    public void testB6() {
-        T_d2l_1 t = new T_d2l_1();
-        assertEquals(Long.MIN_VALUE, t.run(Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2l.jm.T_d2l_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2l.jm.T_d2l_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2l.jm.T_d2l_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.d2l.jm.T_d2l_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_1.j b/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_1.j
deleted file mode 100644
index 10de4b2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_1.j
+++ /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 T_d2l_1.java
-.class public dxc/junit/opcodes/d2l/jm/T_d2l_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)J
-    .limit stack 3
-    .limit locals 3
-    dload_1
-    d2l
-    lreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_1.java b/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_1.java
deleted file mode 100644
index b40863a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_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 dxc.junit.opcodes.d2l.jm;
-
-public class T_d2l_1 {
-
-    public long run(double a) {
-        return (long)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_2.j b/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_2.j
deleted file mode 100644
index 37831f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_2.j
+++ /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_d2l_2.java
-.class public dxc/junit/opcodes/d2l/jm/T_d2l_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(D)J
-    .limit stack 3
-    .limit locals 3
-
-;    dload_1
-    d2l
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_2.java b/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_2.java
deleted file mode 100644
index 9985d3e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_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 dxc.junit.opcodes.d2l.jm;
-
-public class T_d2l_2 {
-
-    public long run(double a) {
-        return (long)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_3.j b/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_3.j
deleted file mode 100644
index 0476a8b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_3.j
+++ /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_d2l_3.java
-.class public dxc/junit/opcodes/d2l/jm/T_d2l_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(F)J
-    .limit stack 2
-    .limit locals 3
-
-    fload_1
-    d2l
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_3.java b/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_3.java
deleted file mode 100644
index 96d73bb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_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 dxc.junit.opcodes.d2l.jm;
-
-public class T_d2l_3 {
-
-    public long run(float a) {
-        return (long)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_4.j b/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_4.j
deleted file mode 100644
index c0551c2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_4.j
+++ /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_d2l_4.java
-.class public dxc/junit/opcodes/d2l/jm/T_d2l_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(J)J
-    .limit stack 3
-    .limit locals 3
-
-    lload_1
-;    l2d
-    d2l
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_4.java b/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_4.java
deleted file mode 100644
index 0bb55a3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_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 dxc.junit.opcodes.d2l.jm;
-
-public class T_d2l_4 {
-
-    public long run(long a) {
-        return (long)(double)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_5.j b/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_5.j
deleted file mode 100644
index 262b187..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_5.j
+++ /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_d2l_5.java
-.class public dxc/junit/opcodes/d2l/jm/T_d2l_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)J
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    d2l
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_5.java b/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_5.java
deleted file mode 100644
index 049e587..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/d2l/jm/T_d2l_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 dxc.junit.opcodes.d2l.jm;
-
-public class T_d2l_5 {
-    
-    public long run(double a) {
-        return (long)a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/Test_dadd.java b/tools/dx-tests/src/dxc/junit/opcodes/dadd/Test_dadd.java
deleted file mode 100644
index 891f6ac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/Test_dadd.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 dxc.junit.opcodes.dadd;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dadd.jm.T_dadd_1;
-
-public class Test_dadd extends DxTestCase {
-
-    /**
-     * @title  Arguments = 2.7d, 3.14d
-     */
-    public void testN1() {
-        T_dadd_1 t = new T_dadd_1();
-        assertEquals(5.84d, t.run(2.7d, 3.14d));
-    }
-
-    /**
-     * @title  Arguments = 0, -3.14d
-     */
-    public void testN2() {
-        T_dadd_1 t = new T_dadd_1();
-        assertEquals(-3.14d, t.run(0, -3.14d));
-    }
-
-    /**
-     * @title Arguments = -3.14d, -2.7d
-     */
-    public void testN3() {
-        T_dadd_1 t = new T_dadd_1();
-        assertEquals(-5.84d, t.run(-3.14d, -2.7d));
-    }
-
-    /**
-     * @title  Arguments = Double.MAX_VALUE, Double.NaN
-     */
-    public void testB1() {
-        T_dadd_1 t = new T_dadd_1();
-        assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY,
-     * Double.NEGATIVE_INFINITY
-     */
-    public void testB2() {
-        T_dadd_1 t = new T_dadd_1();
-        assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
-                Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY,
-     * Double.POSITIVE_INFINITY
-     */
-    public void testB3() {
-        T_dadd_1 t = new T_dadd_1();
-        assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
-                Double.POSITIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY, -2.7d
-     */
-    public void testB4() {
-        T_dadd_1 t = new T_dadd_1();
-        assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
-                -2.7d));
-    }
-
-    /**
-     * @title  Arguments = +0, -0
-     */
-    public void testB5() {
-        T_dadd_1 t = new T_dadd_1();
-        assertEquals(+0d, t.run(+0d, -0d));
-    }
-
-    /**
-     * @title  Arguments = -0d, -0d
-     */
-    public void testB6() {
-        T_dadd_1 t = new T_dadd_1();
-        assertEquals(-0d, t.run(-0d, -0d));
-    }
-
-    /**
-     * @title  Arguments = -2.7d, 2.7d
-     */
-    public void testB7() {
-        T_dadd_1 t = new T_dadd_1();
-        assertEquals(+0d, t.run(-2.7d, 2.7d));
-    }
-
-    /**
-     * @title  Arguments = Double.MAX_VALUE, Double.MAX_VALUE
-     */
-    public void testB8() {
-        T_dadd_1 t = new T_dadd_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_dadd_1 t = new T_dadd_1();
-        assertEquals(0d, t.run(Double.MIN_VALUE, -4.9E-324));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dadd.jm.T_dadd_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dadd.jm.T_dadd_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dadd.jm.T_dadd_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double, reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dadd.jm.T_dadd_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_1.j
deleted file mode 100644
index 34c23af..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dadd_1.java
-.class public dxc/junit/opcodes/dadd/jm/T_dadd_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-    dload_1
-    dload_3
-    dadd
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_1.java
deleted file mode 100644
index 5edfe5c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_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 dxc.junit.opcodes.dadd.jm;
-
-public class T_dadd_1 {
-
-    public double run(double a, double b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_2.j
deleted file mode 100644
index bcfa2a9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dadd_2.java
-.class public dxc/junit/opcodes/dadd/jm/T_dadd_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-    dload_1
-    ; dload_3    
-    dadd
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_2.java
deleted file mode 100644
index bc97e0d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_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 dxc.junit.opcodes.dadd.jm;
-
-public class T_dadd_2 {
-
-    public double run(double a, double b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_3.j
deleted file mode 100644
index 1318e2d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dadd_3.java
-.class public dxc/junit/opcodes/dadd/jm/T_dadd_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FD)D
-    .limit stack 3
-    .limit locals 5
-    fload_1
-    dload_2    
-    dadd
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_3.java
deleted file mode 100644
index 640d826..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_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 dxc.junit.opcodes.dadd.jm;
-
-public class T_dadd_3 {
-
-    public double run(double a, double b) {
-        return a+(double)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_4.j
deleted file mode 100644
index da1c93f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dadd_4.java
-.class public dxc/junit/opcodes/dadd/jm/T_dadd_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JD)D
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    dload_3
-    dadd
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_4.java
deleted file mode 100644
index 8e0f36d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_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 dxc.junit.opcodes.dadd.jm;
-
-public class T_dadd_4 {
-
-    public double run(double a, double b) {
-        return (double)a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_5.j
deleted file mode 100644
index dfea131..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dadd_5.java
-.class public dxc/junit/opcodes/dadd/jm/T_dadd_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-
-    dload_1
-    aload_0
-    dadd
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_5.java
deleted file mode 100644
index fadd2ea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dadd/jm/T_dadd_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 dxc.junit.opcodes.dadd.jm;
-
-public class T_dadd_5 {
-    
-    public double run(double a, double b) {
-        return a+b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/Test_daload.java b/tools/dx-tests/src/dxc/junit/opcodes/daload/Test_daload.java
deleted file mode 100644
index 9fd9893..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/Test_daload.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 dxc.junit.opcodes.daload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.daload.jm.T_daload_1;
-
-public class Test_daload extends DxTestCase {
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN1() {
-        T_daload_1 t = new T_daload_1();
-        double[] arr = new double[2];
-        arr[1] = 3.1415d;
-        assertEquals(3.1415d, t.run(arr, 1));
-    }
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN2() {
-        T_daload_1 t = new T_daload_1();
-        double[] arr = new double[2];
-        arr[0] = 3.1415d;
-        assertEquals(3.1415d, t.run(arr, 0));
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_daload_1 t = new T_daload_1();
-        double[] arr = new double[2];
-        try {
-            t.run(arr, 2);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected NullPointerException
-     */
-    public void testE2() {
-        T_daload_1 t = new T_daload_1();
-        try {
-            t.run(null, 2);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_daload_1 t = new T_daload_1();
-        double[] arr = new double[2];
-        try {
-            t.run(arr, -1);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.daload.jm.T_daload_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.daload.jm.T_daload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.daload.jm.T_daload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.daload.jm.T_daload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - Object, int
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.daload.jm.T_daload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float[], int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.daload.jm.T_daload_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.daload.jm.T_daload_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.daload.jm.T_daload_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_1.j
deleted file mode 100644
index 51f291f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_1.j
+++ /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_daload_1.java
-.class public dxc/junit/opcodes/daload/jm/T_daload_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([DI)D
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-
-    daload
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_1.java
deleted file mode 100644
index 652138a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_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 dxc.junit.opcodes.daload.jm;
-
-public class T_daload_1 {
-    public double run(double[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_2.j
deleted file mode 100644
index 21d2c6d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_2.j
+++ /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_daload_2.java
-.class public dxc/junit/opcodes/daload/jm/T_daload_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([DI)D
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-;    iload_2
-
-    daload
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_2.java
deleted file mode 100644
index 666682d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_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 dxc.junit.opcodes.daload.jm;
-
-public class T_daload_2 {
-
-    public double run(double[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_3.j
deleted file mode 100644
index 5a695a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_daload_3.java
-.class public dxc/junit/opcodes/daload/jm/T_daload_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([DI)D
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    daload
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_3.java
deleted file mode 100644
index 2f8da59..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_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 dxc.junit.opcodes.daload.jm;
-
-public class T_daload_3 {
-
-    public double run(double[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_4.j
deleted file mode 100644
index d7bd17e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_4.j
+++ /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_daload_4.java
-.class public dxc/junit/opcodes/daload/jm/T_daload_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([DD)D
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-;    d2i
-    daload
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_4.java
deleted file mode 100644
index 9572731..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_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 dxc.junit.opcodes.daload.jm;
-
-public class T_daload_4 {
-
-    public double run(double[] arr, double idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_5.j
deleted file mode 100644
index f2025aa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_5.j
+++ /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_daload_5.java
-.class public dxc/junit/opcodes/daload/jm/T_daload_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([DJ)D
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    lload_2
-;    l2f
-    daload
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_5.java
deleted file mode 100644
index 5dd8ee1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_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 dxc.junit.opcodes.daload.jm;
-
-public class T_daload_5 {
-
-    public double run(double[] arr, long idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_6.j
deleted file mode 100644
index 52caafd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_6.j
+++ /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_daload_6.java
-.class public dxc/junit/opcodes/daload/jm/T_daload_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;[DI)D
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_3
-
-    daload
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_6.java
deleted file mode 100644
index 3632e5b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_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 dxc.junit.opcodes.daload.jm;
-
-public class T_daload_6 {
-
-    public double run(Object a, double[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_7.j b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_7.j
deleted file mode 100644
index 694971e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_daload_7.java
-.class public dxc/junit/opcodes/daload/jm/T_daload_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([D[FI)D
-    .limit stack 2
-    .limit locals 4
-    aload_2
-    iload_3
-    daload
-
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_7.java b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_7.java
deleted file mode 100644
index eac7cd2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_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 dxc.junit.opcodes.daload.jm;
-
-public class T_daload_7 {
-
-    public double run(double[] a, double[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_8.j b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_8.j
deleted file mode 100644
index ef9a1a3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_8.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_daload_8.java
-.class public dxc/junit/opcodes/daload/jm/T_daload_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([J[DI)D
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    daload
-
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_8.java b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_8.java
deleted file mode 100644
index 994a158..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_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 dxc.junit.opcodes.daload.jm;
-
-public class T_daload_8 {
-
-    public double run(long[] a, double[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_9.j b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_9.j
deleted file mode 100644
index fa0ef03..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_9.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_daload_9.java
-.class public dxc/junit/opcodes/daload/jm/T_daload_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([DI)D
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    aload_0
-    daload
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_9.java b/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_9.java
deleted file mode 100644
index 440e7a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/daload/jm/T_daload_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 dxc.junit.opcodes.daload.jm;
-
-public class T_daload_9 {
-    
-    public double run(double[] arr, int idx) {
-        return arr[idx];
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/Test_dastore.java b/tools/dx-tests/src/dxc/junit/opcodes/dastore/Test_dastore.java
deleted file mode 100644
index 223d812..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/Test_dastore.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 dxc.junit.opcodes.dastore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dastore.jm.T_dastore_1;
-
-public class Test_dastore extends DxTestCase {
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN1() {
-        T_dastore_1 t = new T_dastore_1();
-        double[] arr = new double[2];
-        t.run(arr, 1, 2.7d);
-        assertEquals(2.7d, arr[1]);
-    }
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN2() {
-        T_dastore_1 t = new T_dastore_1();
-        double[] arr = new double[2];
-        t.run(arr, 0, 2.7d);
-        assertEquals(2.7d, arr[0]);
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_dastore_1 t = new T_dastore_1();
-        double[] arr = new double[2];
-        try {
-            t.run(arr, 2, 2.7d);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected NullPointerException
-     */
-    public void testE2() {
-        T_dastore_1 t = new T_dastore_1();
-        try {
-            t.run(null, 2, 2.7d);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_dastore_1 t = new T_dastore_1();
-        double[] arr = new double[2];
-        try {
-            t.run(arr, -1, 2.7d);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dastore.jm.T_dastore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dastore.jm.T_dastore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double,
-     * double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dastore.jm.T_dastore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, int, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dastore.jm.T_dastore_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - object, int,
-     * double
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.dastore.jm.T_dastore_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float[], int,
-     * double
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.dastore.jm.T_dastore_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int,
-     * double
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.dastore.jm.T_dastore_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference,
-     * double
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.dastore.jm.T_dastore_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_1.j
deleted file mode 100644
index 5088f559..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_1.j
+++ /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_dastore_1.java
-.class public dxc/junit/opcodes/dastore/jm/T_dastore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([DID)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    iload_2
-    dload_3
-    dastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_1.java
deleted file mode 100644
index 927890e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_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 dxc.junit.opcodes.dastore.jm;
-
-public class T_dastore_1 {
-    public void run(double[] arr, int idx, double value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_2.j
deleted file mode 100644
index 2e663f6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_2.j
+++ /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_dastore_2.java
-.class public dxc/junit/opcodes/dastore/jm/T_dastore_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([DID)V
-    .limit stack 3
-    .limit locals 5
-
-    aload_1
-    iload_2
-    ;dload_3
-    dastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_2.java
deleted file mode 100644
index fac0a98..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_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 dxc.junit.opcodes.dastore.jm;
-
-public class T_dastore_2 {
-
-    public void run(double[] arr, int idx, double value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_3.j
deleted file mode 100644
index a2a2b00..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_3.j
+++ /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_dastore_3.java
-.class public dxc/junit/opcodes/dastore/jm/T_dastore_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([DID)V
-    .limit stack 3
-    .limit locals 5
-
-    ;aload_1
-    iload_2
-    dload_3
-    dastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_3.java
deleted file mode 100644
index c6fc58c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_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 dxc.junit.opcodes.dastore.jm;
-
-public class T_dastore_3 {
-
-    public void run(double[] arr, int idx, double value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_4.j
deleted file mode 100644
index 38e7bab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_4.j
+++ /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_dastore_4.java
-.class public dxc/junit/opcodes/dastore/jm/T_dastore_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([DDD)V
-    .limit stack 6
-    .limit locals 6
-
-    aload_1
-    dload_2
-;    d2i
-    dload 4
-
-    dastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_4.java
deleted file mode 100644
index 4d368a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_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 dxc.junit.opcodes.dastore.jm;
-
-public class T_dastore_4 {
-
-    public void run(double[] arr, double idx, double value) {
-        arr[(int)idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_5.j
deleted file mode 100644
index cf5f55e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_5.j
+++ /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_dastore_5.java
-.class public dxc/junit/opcodes/dastore/jm/T_dastore_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([DIJ)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    iload_2
-    lload_3
-;    l2f
-    dastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_5.java
deleted file mode 100644
index c5b7ff8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_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 dxc.junit.opcodes.dastore.jm;
-
-public class T_dastore_5 {
-
-    public void run(double[] arr, int idx, double value) {
-        arr[idx] = (double)value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_6.j
deleted file mode 100644
index f3eace3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_6.j
+++ /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_dastore_6.java
-.class public dxc/junit/opcodes/dastore/jm/T_dastore_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;ID)V
-    .limit stack 4
-    .limit locals 6
-
-    aload_1
-    iload_2
-    dload_3
-    dastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_6.java
deleted file mode 100644
index cbbf398..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_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 dxc.junit.opcodes.dastore.jm;
-
-public class T_dastore_6 {
-
-    public void run(Object a, double[] arr, int idx, double value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_7.j b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_7.j
deleted file mode 100644
index 0ad9369..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_7.j
+++ /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_dastore_7.java
-.class public dxc/junit/opcodes/dastore/jm/T_dastore_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([D[FID)V
-    .limit stack 4
-    .limit locals 6
-    
-    aload_2
-    iload_3
-    dload 4
-    dastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_7.java b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_7.java
deleted file mode 100644
index f6225df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_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 dxc.junit.opcodes.dastore.jm;
-
-public class T_dastore_7 {
-
-    public void run(double a[], float[] arr, int idx, double value) {
-        a[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_8.j b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_8.j
deleted file mode 100644
index c04e9a1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_8.j
+++ /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_dastore_8.java
-.class public dxc/junit/opcodes/dastore/jm/T_dastore_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([J[DID)V
-    .limit stack 4
-    .limit locals 6
-    
-    aload_1
-    iload_3
-    dload 4
-    dastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_8.java b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_8.java
deleted file mode 100644
index 705e711..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_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 dxc.junit.opcodes.dastore.jm;
-
-public class T_dastore_8 {
-
-    public void run(long a[], double[] arr, int idx, double value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_9.j b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_9.j
deleted file mode 100644
index b8ef436..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dastore_9.java
-.class public dxc/junit/opcodes/dastore/jm/T_dastore_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([DID)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    aload_0
-    dload_3
-    dastore
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_9.java b/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_9.java
deleted file mode 100644
index af682a1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dastore/jm/T_dastore_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 dxc.junit.opcodes.dastore.jm;
-
-public class T_dastore_9 {
-    
-    public void run(double[] arr, int idx, double value) {
-        arr[idx] = value;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/Test_dcmpg.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/Test_dcmpg.java
deleted file mode 100644
index bb99cd7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/Test_dcmpg.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dcmpg;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dcmpg.jm.T_dcmpg_1;
-
-public class Test_dcmpg extends DxTestCase {
-
-    /**
-     * @title  Arguments = 3.14d, 2.7d
-     */
-    public void testN1() {
-        T_dcmpg_1 t = new T_dcmpg_1();
-        assertEquals(1, t.run(3.14d, 2.7d));
-    }
-
-    /**
-     * @title  Arguments = -3.14d, 2.7d
-     */
-    public void testN2() {
-        T_dcmpg_1 t = new T_dcmpg_1();
-        assertEquals(-1, t.run(-3.14d, 2.7d));
-    }
-
-    /**
-     * @title  Arguments = 3.14, 3.14
-     */
-    public void testN3() {
-        T_dcmpg_1 t = new T_dcmpg_1();
-        assertEquals(0, t.run(3.14d, 3.14d));
-    }
-
-    /**
-     * @title  Arguments = Double.NaN, Double.MAX_VALUE
-     */
-    public void testB1() {
-        T_dcmpg_1 t = new T_dcmpg_1();
-        assertEquals(1, t.run(Double.NaN, Double.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = +0, -0
-     */
-    public void testB2() {
-        T_dcmpg_1 t = new T_dcmpg_1();
-        assertEquals(0, t.run(+0f, -0f));
-    }
-
-    /**
-     * @title  Arguments = Double.NEGATIVE_INFINITY, Double.MIN_VALUE
-     */
-    public void testB3() {
-        T_dcmpg_1 t = new T_dcmpg_1();
-        assertEquals(-1, t.run(Double.NEGATIVE_INFINITY, Double.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY, Double.MAX_VALUE
-     */
-    public void testB4() {
-        T_dcmpg_1 t = new T_dcmpg_1();
-        assertEquals(1, t.run(Double.POSITIVE_INFINITY, Double.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY,
-     * Double.NEGATIVE_INFINITY
-     */
-    public void testB5() {
-        T_dcmpg_1 t = new T_dcmpg_1();
-        assertEquals(1, t.run(Double.POSITIVE_INFINITY,
-                Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dcmpg.jm.T_dcmpg_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double, float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dcmpg.jm.T_dcmpg_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dcmpg.jm.T_dcmpg_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double, reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dcmpg.jm.T_dcmpg_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_1.j
deleted file mode 100644
index 788ed13..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_1.j
+++ /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_dcmpg_1.java
-.class public dxc/junit/opcodes/dcmpg/jm/T_dcmpg_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)I
-    .limit stack 4
-    .limit locals 6
-    
-    dload_1
-    dload_3
-    
-    dcmpg 
-    dup
-    ifeq Label0
-    ifgt Label1
-    
-    iconst_m1
-    ireturn
-    
-    Label0:
-    iconst_0
-    ireturn
-
-    Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_1.java
deleted file mode 100644
index 4b9e6c1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_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 dxc.junit.opcodes.dcmpg.jm;
-
-public class T_dcmpg_1 {
-
-    public int run(double a, double b) {
-        if(a > b)
-            return 1;
-        if(a == b)
-            return 0;
-        return -1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_2.j
deleted file mode 100644
index e8d237d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_2.j
+++ /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_dcmpg_2.java
-.class public dxc/junit/opcodes/dcmpg/jm/T_dcmpg_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DD)Z
-    .limit stack 4
-    .limit locals 6
-
-    dload_1
-;    fload_3
-    dcmpg
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_2.java
deleted file mode 100644
index 6ff5dff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_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 dxc.junit.opcodes.dcmpg.jm;
-
-public class T_dcmpg_2 {
-
-    public boolean run(double a, double b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_3.j
deleted file mode 100644
index fb5f6d7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_3.j
+++ /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_dcmpg_3.java
-.class public dxc/junit/opcodes/dcmpg/jm/T_dcmpg_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(DD)Z
-    .limit stack 4
-    .limit locals 6
-
-    dload_1
-    fconst_1
-    dcmpg 
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_3.java
deleted file mode 100644
index 1101f00..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_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 dxc.junit.opcodes.dcmpg.jm;
-
-public class T_dcmpg_3 {
-
-    public boolean run(double a, double b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_4.j
deleted file mode 100644
index 8e23715..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_4.j
+++ /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_dcmpg_4.java
-.class public dxc/junit/opcodes/dcmpg/jm/T_dcmpg_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(DD)Z
-    .limit stack 4
-    .limit locals 6
-
-    lconst_1    
-    dload_1
-
-    dcmpg 
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_4.java
deleted file mode 100644
index ae2d937..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_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 dxc.junit.opcodes.dcmpg.jm;
-
-public class T_dcmpg_4 {
-
-    public boolean run(double a, double b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_5.j
deleted file mode 100644
index 9f9d92f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_5.j
+++ /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_dcmpg_5.java
-.class public dxc/junit/opcodes/dcmpg/jm/T_dcmpg_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)Z
-    .limit stack 4
-    .limit locals 5
-
-    dload_1
-    aload_0
-    dcmpl
-    ifle Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_5.java
deleted file mode 100644
index 45663f8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpg/jm/T_dcmpg_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 dxc.junit.opcodes.dcmpg.jm;
-
-public class T_dcmpg_5 {
-    
-    public boolean run(double a, double b) {
-        return a > b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/Test_dcmpl.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/Test_dcmpl.java
deleted file mode 100644
index 045c181..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/Test_dcmpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dcmpl;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dcmpl.jm.T_dcmpl_1;
-
-public class Test_dcmpl extends DxTestCase {
-
-    /**
-     * @title  Arguments = 3.14d, 2.7d
-     */
-    public void testN1() {
-        T_dcmpl_1 t = new T_dcmpl_1();
-        assertEquals(1, t.run(3.14d, 2.7d));
-    }
-
-    /**
-     * @title  Arguments = -3.14d, 2.7d
-     */
-    public void testN2() {
-        T_dcmpl_1 t = new T_dcmpl_1();
-        assertEquals(-1, t.run(-3.14d, 2.7d));
-    }
-
-    /**
-     * @title  Arguments = 3.14, 3.14
-     */
-    public void testN3() {
-        T_dcmpl_1 t = new T_dcmpl_1();
-        assertEquals(0, t.run(3.14d, 3.14d));
-    }
-
-    /**
-     * @title  Arguments = Double.NaN, Double.MAX_VALUE
-     */
-    public void testB1() {
-        T_dcmpl_1 t = new T_dcmpl_1();
-        assertEquals(-1, t.run(Double.NaN, Double.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = +0, -0
-     */
-    public void testB2() {
-        T_dcmpl_1 t = new T_dcmpl_1();
-        assertEquals(0, t.run(+0f, -0f));
-    }
-
-    /**
-     * @title  Arguments = Double.NEGATIVE_INFINITY, Double.MIN_VALUE
-     */
-    public void testB3() {
-        T_dcmpl_1 t = new T_dcmpl_1();
-        assertEquals(-1, t.run(Double.NEGATIVE_INFINITY, Double.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY, Double.MAX_VALUE
-     */
-    public void testB4() {
-        T_dcmpl_1 t = new T_dcmpl_1();
-        assertEquals(1, t.run(Double.POSITIVE_INFINITY, Double.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY,
-     * Double.NEGATIVE_INFINITY
-     */
-    public void testB5() {
-        T_dcmpl_1 t = new T_dcmpl_1();
-        assertEquals(1, t.run(Double.POSITIVE_INFINITY,
-                Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dcmpl.jm.T_dcmpl_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double, float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dcmpl.jm.T_dcmpl_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dcmpl.jm.T_dcmpl_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double, reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dcmpl.jm.T_dcmpl_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_1.j
deleted file mode 100644
index 35b12a4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_1.j
+++ /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_dcmpl_1.java
-.class public dxc/junit/opcodes/dcmpl/jm/T_dcmpl_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)I
-    .limit stack 4
-    .limit locals 6
-    
-    dload_1
-    dload_3
-    
-    dcmpl 
-    dup
-    ifeq Label0
-    ifgt Label1
-    
-    iconst_m1
-    ireturn
-    
-    Label0:
-    iconst_0
-    ireturn
-
-    Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_1.java
deleted file mode 100644
index 7effb95..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_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 dxc.junit.opcodes.dcmpl.jm;
-
-public class T_dcmpl_1 {
-
-    public int run(double a, double b) {
-        if(a > b)
-            return 1;
-        if(a == b)
-            return 0;
-        return -1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_2.j
deleted file mode 100644
index d4fa52c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_2.j
+++ /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_dcmpl_2.java
-.class public dxc/junit/opcodes/dcmpl/jm/T_dcmpl_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DD)Z
-    .limit stack 4
-    .limit locals 6
-
-    dload_1
-;    fload_3
-    dcmpl
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_2.java
deleted file mode 100644
index 583256a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_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 dxc.junit.opcodes.dcmpl.jm;
-
-public class T_dcmpl_2 {
-
-    public boolean run(double a, double b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_3.j
deleted file mode 100644
index 4db6e33..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_3.j
+++ /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_dcmpl_3.java
-.class public dxc/junit/opcodes/dcmpl/jm/T_dcmpl_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(DD)Z
-    .limit stack 4
-    .limit locals 6
-
-    dload_1
-    fconst_1
-    dcmpl 
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_3.java
deleted file mode 100644
index fdb3329..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_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 dxc.junit.opcodes.dcmpl.jm;
-
-public class T_dcmpl_3 {
-
-    public boolean run(double a, double b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_4.j
deleted file mode 100644
index 7b18e83..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_4.j
+++ /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_dcmpl_4.java
-.class public dxc/junit/opcodes/dcmpl/jm/T_dcmpl_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(DD)Z
-    .limit stack 4
-    .limit locals 6
-
-    lconst_1    
-    dload_1
-
-    dcmpl 
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_4.java
deleted file mode 100644
index f2a8b24..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_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 dxc.junit.opcodes.dcmpl.jm;
-
-public class T_dcmpl_4 {
-
-    public boolean run(double a, double b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_5.j
deleted file mode 100644
index 56d80b9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_5.j
+++ /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_dcmpl_5.java
-.class public dxc/junit/opcodes/dcmpl/jm/T_dcmpl_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)Z
-    .limit stack 4
-    .limit locals 5
-
-    dload_1
-    aload_0
-    dcmpl
-    ifle Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_5.java
deleted file mode 100644
index 79d1bf8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dcmpl/jm/T_dcmpl_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 dxc.junit.opcodes.dcmpl.jm;
-
-public class T_dcmpl_5 {
-    
-    public boolean run(double a, double b) {
-        return a > b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/Test_dconst_0.java b/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/Test_dconst_0.java
deleted file mode 100644
index 1dc0718..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/Test_dconst_0.java
+++ /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.
- */
-
-package dxc.junit.opcodes.dconst_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dconst_0.jm.T_dconst_0_1;
-
-public class Test_dconst_0 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_dconst_0_1 t = new T_dconst_0_1();
-        double b = 1234d;
-        double c = 1234d;
-        double d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dconst_0.jm.T_dconst_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_1.j
deleted file mode 100644
index c6b15b82..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_1.j
+++ /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_dconst_0_1.java
-.class public dxc/junit/opcodes/dconst_0/jm/T_dconst_0_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()D
-    .limit stack 2
-    dconst_0
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_1.java
deleted file mode 100644
index bb40485..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_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 dxc.junit.opcodes.dconst_0.jm;
-
-public class T_dconst_0_1 {
-
-    public double run() {
-        return 0d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_2.j
deleted file mode 100644
index 163d026..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_2.j
+++ /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_dconst_0_2.java
-.class public dxc/junit/opcodes/dconst_0/jm/T_dconst_0_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()D
-    .limit stack 1
-;    .limit locals 1
-
-    dconst_0
-    dconst_0
-
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_2.java
deleted file mode 100644
index 47856ed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dconst_0/jm/T_dconst_0_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 dxc.junit.opcodes.dconst_0.jm;
-
-public class T_dconst_0_2 {
-
-    public double run() {
-        return 0d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/Test_dconst_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/Test_dconst_1.java
deleted file mode 100644
index 2b15a2d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/Test_dconst_1.java
+++ /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.
- */
-
-package dxc.junit.opcodes.dconst_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dconst_1.jm.T_dconst_1_1;
-
-public class Test_dconst_1 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_dconst_1_1 t = new T_dconst_1_1();
-        double b = 1235d;
-        double c = 1234d;
-        double d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dconst_1.jm.T_dconst_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_1.j
deleted file mode 100644
index 2636b26..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_1.j
+++ /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_dconst_1_1.java
-.class public dxc/junit/opcodes/dconst_1/jm/T_dconst_1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()D
-    .limit stack 2
-    dconst_1
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_1.java
deleted file mode 100644
index a332a75..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_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 dxc.junit.opcodes.dconst_1.jm;
-
-public class T_dconst_1_1 {
-
-    public double run() {
-        return 0d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_2.j
deleted file mode 100644
index 9a17a14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_2.j
+++ /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_dconst_1_2.java
-.class public dxc/junit/opcodes/dconst_1/jm/T_dconst_1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()D
-    .limit stack 1
-;    .limit locals 1
-
-    dconst_1
-    dconst_1
-
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_2.java
deleted file mode 100644
index 88726ac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dconst_1/jm/T_dconst_1_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 dxc.junit.opcodes.dconst_1.jm;
-
-public class T_dconst_1_2 {
-
-    public double run() {
-        return 0d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/Test_ddiv.java b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/Test_ddiv.java
deleted file mode 100644
index e97558a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/Test_ddiv.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 dxc.junit.opcodes.ddiv;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ddiv.jm.T_ddiv_1;
-
-public class Test_ddiv extends DxTestCase {
-
-    /**
-     * @title Arguments = 2.7d, 3.14d
-     */
-    public void testN1() {
-
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(0.8598726114649682d, t.run(2.7d, 3.14d));
-    }
-
-    /**
-     * @title  Dividend = 0
-     */
-    public void testN2() {
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(0d, t.run(0, 3.14d));
-    }
-
-    /**
-     * @title  Dividend is negative
-     */
-    public void testN3() {
-
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(-1.162962962962963d, t.run(-3.14d, 2.7d));
-    }
-
-    /**
-     * @title  Dividend is negative
-     */
-    public void testN4() {
-
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(-1.162962962962963d, t.run(-3.14d, 2.7d));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY,
-     * Double.NEGATIVE_INFINITY
-     */
-    public void testB2() {
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
-                Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY, -2.7d
-     */
-    public void testB3() {
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
-                -2.7d));
-    }
-
-    /**
-     * @title  Arguments = -2.7d, Double.NEGATIVE_INFINITY
-     */
-    public void testB4() {
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(0d, t.run(-2.7d, Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = 0, 0
-     */
-    public void testB5() {
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(Double.NaN, t.run(0, 0));
-    }
-
-    /**
-     * @title  Arguments = 0, -2.7
-     */
-    public void testB6() {
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(-0d, t.run(0, -2.7d));
-    }
-
-    /**
-     * @title  Arguments = -2.7, 0
-     */
-    public void testB7() {
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(Double.NEGATIVE_INFINITY, t.run(-2.7d, 0));
-    }
-
-    /**
-     * @title  Arguments = 1, Double.MAX_VALUE
-     */
-    public void testB8() {
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(Double.POSITIVE_INFINITY, t.run(1, Double.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Double.MAX_VALUE, -1E-9f
-     */
-    public void testB9() {
-        T_ddiv_1 t = new T_ddiv_1();
-        assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.MAX_VALUE, -1E-9f));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ddiv.jm.T_ddiv_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float / double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ddiv.jm.T_ddiv_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ddiv.jm.T_ddiv_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double /
-     * reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ddiv.jm.T_ddiv_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_1.j
deleted file mode 100644
index 97285f5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ddiv_1.java
-.class public dxc/junit/opcodes/ddiv/jm/T_ddiv_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-    dload_1
-    dload_3
-    ddiv
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_1.java
deleted file mode 100644
index bb7e5d5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_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 dxc.junit.opcodes.ddiv.jm;
-
-public class T_ddiv_1 {
-
-    public double run(double a, double b) {
-        return a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_2.j
deleted file mode 100644
index fd03c32..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ddiv_2.java
-.class public dxc/junit/opcodes/ddiv/jm/T_ddiv_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-    dload_1
-    ; dload_3
-    ddiv
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_2.java
deleted file mode 100644
index a3c1b12..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_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 dxc.junit.opcodes.ddiv.jm;
-
-public class T_ddiv_2 {
-
-    public double run(double a, double b) {
-        return a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_3.j
deleted file mode 100644
index 1d5da57..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ddiv_3.java
-.class public dxc/junit/opcodes/ddiv/jm/T_ddiv_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FD)D
-    .limit stack 3
-    .limit locals 5
-    fload_1
-    dload_2    
-    ddiv
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_3.java
deleted file mode 100644
index 8fc4917..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_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 dxc.junit.opcodes.ddiv.jm;
-
-public class T_ddiv_3 {
-
-    public double run(float a, double b) {
-        return (double)a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_4.j
deleted file mode 100644
index 037c781..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ddiv_4.java
-.class public dxc/junit/opcodes/ddiv/jm/T_ddiv_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JD)D
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    dload_3
-    ddiv
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_4.java
deleted file mode 100644
index 3861a04..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_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 dxc.junit.opcodes.ddiv.jm;
-
-public class T_ddiv_4 {
-
-    public double run(long a, double b) {
-        return (double)a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_5.j
deleted file mode 100644
index f7d28aa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ddiv_5.java
-.class public dxc/junit/opcodes/ddiv/jm/T_ddiv_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-
-    dload_1
-    aload_0
-    ddiv
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_5.java
deleted file mode 100644
index 51f30d3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ddiv/jm/T_ddiv_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 dxc.junit.opcodes.ddiv.jm;
-
-public class T_ddiv_5 {
-    
-    public double run(double a, double b) {
-        return a/b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/Test_dload.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/Test_dload.java
deleted file mode 100644
index 87607ca..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/Test_dload.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 dxc.junit.opcodes.dload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dload.jm.T_dload_1;
-import dxc.junit.opcodes.dload.jm.T_dload_1_w;
-import dxc.junit.opcodes.dload.jm.T_dload_2;
-import dxc.junit.opcodes.dload.jm.T_dload_2_w;
-
-public class Test_dload extends DxTestCase {
-
-    /*
-     * NORMAL dload VERSION
-     */
-
-    /**
-     * @title  Test dload 1
-     */
-    public void testN1() {
-        T_dload_1 t = new T_dload_1();
-        assertEquals(1d, t.run());
-    }
-
-    /**
-     * @title  Test dload 255
-     */
-    public void testN2() {
-        T_dload_2 t = new T_dload_2();
-        assertEquals(1d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.21
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload.jm.T_dload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload.jm.T_dload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload.jm.T_dload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload.jm.T_dload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE dload VERSION
-     */
-
-    /**
-     * @title  Test dload 257
-     */
-    public void testN3() {
-        T_dload_1_w t = new T_dload_1_w();
-        assertEquals(1d, t.run());
-    }
-
-    /**
-     * @title  Test dload_w 1
-     */
-    public void testN4() {
-        T_dload_2_w t = new T_dload_2_w();
-        assertEquals(1d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload.jm.T_dload_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload.jm.T_dload_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload.jm.T_dload_5_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload.jm.T_dload_6_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1.j
deleted file mode 100644
index ea6f194..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1.j
+++ /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_dload_1.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()D
-    .limit stack 4
-    .limit locals 6
-    
-    dconst_1
-    dstore 4
-    dconst_0
-    dload 4
-    
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1.java
deleted file mode 100644
index 7775049..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_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 dxc.junit.opcodes.dload.jm;
-
-public class T_dload_1 {
-
-    public double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1_w.j
deleted file mode 100644
index c6c9056..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1_w.j
+++ /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_dload_1_w.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_1_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()D
-    .limit stack 4
-    .limit locals 300
-    
-    dconst_1
-    dstore 257
-    dconst_0
-    dload 257
-    
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1_w.java
deleted file mode 100644
index 337b02d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_1_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dload.jm;
-
-public class T_dload_1_w {
-
-    public double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2.j
deleted file mode 100644
index dd97744..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2.j
+++ /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_dload_2.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()D
-    .limit stack 4
-    .limit locals 300
-    
-    dconst_1
-    dstore 255
-    dconst_0
-    dload 255
-    
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2.java
deleted file mode 100644
index 002071f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_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 dxc.junit.opcodes.dload.jm;
-
-public class T_dload_2 {
-
-      public double run() {
-          return 1d;
-      }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2_w.j
deleted file mode 100644
index 0874c3e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2_w.j
+++ /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_dload_2_w.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_2_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()D
-    .limit stack 4
-    .limit locals 4
-    
-    dconst_1
-    dstore 1
-    dconst_0
-    dload_w 1
-    
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2_w.java
deleted file mode 100644
index c5140b5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_2_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dload.jm;
-
-public class T_dload_2_w {
-
-      public double run() {
-          return 1d;
-      }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3.j
deleted file mode 100644
index bed08c5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dload_3.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 0
-
-    dload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3.java
deleted file mode 100644
index eefa007..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3.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 dxc.junit.opcodes.dload.jm;
-
-public class T_dload_3 {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3_w.j
deleted file mode 100644
index 7618f0d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dload_3_w.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_3_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 300
-
-    dload 300
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3_w.java
deleted file mode 100644
index 01eb395..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_3_w.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 dxc.junit.opcodes.dload.jm;
-
-public class T_dload_3_w {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4.j
deleted file mode 100644
index a1731d0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4.j
+++ /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_dload_4.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    fstore_0
-    fconst_1
-    fstore_1
-    
-    dload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4.java
deleted file mode 100644
index 13c99db..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_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 dxc.junit.opcodes.dload.jm;
-
-public class T_dload_4 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4_w.j
deleted file mode 100644
index 855d01e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4_w.j
+++ /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_dload_4_w.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_4_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 300
-
-    fconst_1
-    fstore 260
-    fconst_1
-    fstore 261
-    
-    dload_w 260
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4_w.java
deleted file mode 100644
index 6810298..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_4_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dload.jm;
-
-public class T_dload_4_w {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5.j
deleted file mode 100644
index d363cab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5.j
+++ /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_dload_5.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_0
-    
-    dload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5.java
deleted file mode 100644
index 1428a19..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_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 dxc.junit.opcodes.dload.jm;
-
-public class T_dload_5 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5_w.j
deleted file mode 100644
index bf96314..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5_w.j
+++ /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_dload_5_w.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_5_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 300
-
-    lconst_1
-    lstore 260
-    
-    dload_w 260
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5_w.java
deleted file mode 100644
index 8010dc0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_5_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dload.jm;
-
-public class T_dload_5_w {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6.j
deleted file mode 100644
index 07b4434..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6.j
+++ /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_dload_6.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 2
-
-    dconst_1
-    dstore_0
-    
-    dload 0
-    dload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6.java
deleted file mode 100644
index 41b6572..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_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 dxc.junit.opcodes.dload.jm;
-
-public class T_dload_6 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6_w.j
deleted file mode 100644
index 4a92f33..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6_w.j
+++ /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_dload_6_w.java
-.class public dxc/junit/opcodes/dload/jm/T_dload_6_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 300
-
-    dconst_1
-    dstore 260
-    
-    dload_w 260
-    dload_w 260
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6_w.java
deleted file mode 100644
index d2d54e3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload/jm/T_dload_6_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dload.jm;
-
-public class T_dload_6_w {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/Test_dload_0.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/Test_dload_0.java
deleted file mode 100644
index 3386d70..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/Test_dload_0.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dload_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dload_0.jm.T_dload_0_1;
-import dxc.junit.opcodes.dload_0.jm.T_dload_0_6;
-
-public class Test_dload_0 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(1d, T_dload_0_1.run());
-    }
-
-    /**
-     * @title equality of dload_<n> and dload <n>
-     */
-    public void testN2() {
-        assertTrue(T_dload_0_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_0.jm.T_dload_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_0.jm.T_dload_0_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_0.jm.T_dload_0_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_0.jm.T_dload_0_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_1.j
deleted file mode 100644
index efadce3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dload_0_1.java
-.class public dxc/junit/opcodes/dload_0/jm/T_dload_0_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 4
-    
-    dconst_1
-    dstore_0
-    dconst_0
-    dload_0
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_1.java
deleted file mode 100644
index b6c0a13..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_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 dxc.junit.opcodes.dload_0.jm;
-
-public class T_dload_0_1 {
-
-    public static double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_2.j
deleted file mode 100644
index 7da999c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dload_0_2.java
-.class public dxc/junit/opcodes/dload_0/jm/T_dload_0_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    dload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_2.java
deleted file mode 100644
index 05fe279..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_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 dxc.junit.opcodes.dload_0.jm;
-
-public class T_dload_0_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_3.j
deleted file mode 100644
index 07fa8f4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_3.j
+++ /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_dload_0_3.java
-.class public dxc/junit/opcodes/dload_0/jm/T_dload_0_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    fstore_0
-    fconst_1
-    fstore_1
-    
-    dload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_3.java
deleted file mode 100644
index 86dcec7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_3.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 dxc.junit.opcodes.dload_0.jm;
-
-public class T_dload_0_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_4.j
deleted file mode 100644
index 6254ac4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_4.j
+++ /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_dload_0_4.java
-.class public dxc/junit/opcodes/dload_0/jm/T_dload_0_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_0
-    
-    dload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_4.java
deleted file mode 100644
index ffcfe2b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_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 dxc.junit.opcodes.dload_0.jm;
-
-public class T_dload_0_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_5.j
deleted file mode 100644
index 6c7c879..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_5.j
+++ /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_dload_0_5.java
-.class public dxc/junit/opcodes/dload_0/jm/T_dload_0_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 4
-
-    dconst_1
-    dstore_0
-    
-    dload_0
-    dload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_5.java
deleted file mode 100644
index 1cdadbc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_5.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 dxc.junit.opcodes.dload_0.jm;
-
-public class T_dload_0_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_6.j
deleted file mode 100644
index 43843a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_6.j
+++ /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_dload_0_6.java
-.class public dxc/junit/opcodes/dload_0/jm/T_dload_0_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 2
-
-    dconst_1
-    dstore_0
-
-    dload_0
-    dload 0
-    dcmpl 
-    
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_6.java
deleted file mode 100644
index 03e3a47..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_0/jm/T_dload_0_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 dxc.junit.opcodes.dload_0.jm;
-
-public class T_dload_0_6 {
-
-    public static boolean run() {
-        double i = 1d;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/Test_dload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/Test_dload_1.java
deleted file mode 100644
index 78e1d63..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/Test_dload_1.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dload_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dload_1.jm.T_dload_1_1;
-import dxc.junit.opcodes.dload_1.jm.T_dload_1_6;
-
-public class Test_dload_1 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(1d, T_dload_1_1.run());
-    }
-
-    /**
-     * @title equality of dload_<n> and dload <n>
-     */
-    public void testN2() {
-        assertTrue(T_dload_1_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_1.jm.T_dload_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_1.jm.T_dload_1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_1.jm.T_dload_1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_1.jm.T_dload_1_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_1.j
deleted file mode 100644
index f0b8614..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dload_1_1.java
-.class public dxc/junit/opcodes/dload_1/jm/T_dload_1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 4
-    
-    dconst_1
-    dstore_1
-    dconst_0
-    dload_1
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_1.java
deleted file mode 100644
index 08c6c4c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_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 dxc.junit.opcodes.dload_1.jm;
-
-public class T_dload_1_1 {
-
-    public static double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_2.j
deleted file mode 100644
index c3c537b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dload_1_2.java
-.class public dxc/junit/opcodes/dload_1/jm/T_dload_1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 1
-
-    dload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_2.java
deleted file mode 100644
index e9d012a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_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 dxc.junit.opcodes.dload_1.jm;
-
-public class T_dload_1_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_3.j
deleted file mode 100644
index 23521db..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_3.j
+++ /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_dload_1_3.java
-.class public dxc/junit/opcodes/dload_1/jm/T_dload_1_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    fstore_1
-    fconst_1
-    fstore_2
-    
-    dload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_3.java
deleted file mode 100644
index ce229e6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_3.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 dxc.junit.opcodes.dload_1.jm;
-
-public class T_dload_1_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_4.j
deleted file mode 100644
index ae50746..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_4.j
+++ /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_dload_1_4.java
-.class public dxc/junit/opcodes/dload_1/jm/T_dload_1_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_1
-    
-    dload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_4.java
deleted file mode 100644
index 3e6eadb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_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 dxc.junit.opcodes.dload_1.jm;
-
-public class T_dload_1_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_5.j
deleted file mode 100644
index 247a0ea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_5.j
+++ /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_dload_1_5.java
-.class public dxc/junit/opcodes/dload_1/jm/T_dload_1_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 4
-
-    dconst_1
-    dstore_1
-    
-    dload_1
-    dload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_5.java
deleted file mode 100644
index 569b8be..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_5.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 dxc.junit.opcodes.dload_1.jm;
-
-public class T_dload_1_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_6.j
deleted file mode 100644
index 6a3adfe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_6.j
+++ /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_dload_1_6.java
-.class public dxc/junit/opcodes/dload_1/jm/T_dload_1_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_1
-
-    dload_1
-    dload 1
-    dcmpl 
-    
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_6.java
deleted file mode 100644
index fda7e3a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_1/jm/T_dload_1_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 dxc.junit.opcodes.dload_1.jm;
-
-public class T_dload_1_6 {
-
-    public static boolean run() {
-        double i = 1d;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/Test_dload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/Test_dload_2.java
deleted file mode 100644
index b0d5ede..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/Test_dload_2.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dload_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dload_2.jm.T_dload_2_1;
-import dxc.junit.opcodes.dload_2.jm.T_dload_2_6;
-
-public class Test_dload_2 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(1d, T_dload_2_1.run());
-    }
-
-    /**
-     * @title equality of dload_<n> and dload <n>
-     */
-    public void testN2() {
-        assertTrue(T_dload_2_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_2.jm.T_dload_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_2.jm.T_dload_2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_2.jm.T_dload_2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_2.jm.T_dload_2_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_1.j
deleted file mode 100644
index 5dbb5f1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dload_2_1.java
-.class public dxc/junit/opcodes/dload_2/jm/T_dload_2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 4
-    
-    dconst_1
-    dstore_2
-    dconst_0
-    dload_2
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_1.java
deleted file mode 100644
index bd20ce7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_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 dxc.junit.opcodes.dload_2.jm;
-
-public class T_dload_2_1 {
-
-    public static double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_2.j
deleted file mode 100644
index 998877e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dload_2_2.java
-.class public dxc/junit/opcodes/dload_2/jm/T_dload_2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    dload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_2.java
deleted file mode 100644
index eeab9cc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_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 dxc.junit.opcodes.dload_2.jm;
-
-public class T_dload_2_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_3.j
deleted file mode 100644
index d907737..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_3.j
+++ /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_dload_2_3.java
-.class public dxc/junit/opcodes/dload_2/jm/T_dload_2_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    fstore_2
-    fconst_1
-    fstore_3
-    
-    dload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_3.java
deleted file mode 100644
index 7c20960..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_3.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 dxc.junit.opcodes.dload_2.jm;
-
-public class T_dload_2_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_4.j
deleted file mode 100644
index 2330dd2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_4.j
+++ /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_dload_2_4.java
-.class public dxc/junit/opcodes/dload_2/jm/T_dload_2_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_2
-    
-    dload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_4.java
deleted file mode 100644
index d01ef76..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_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 dxc.junit.opcodes.dload_2.jm;
-
-public class T_dload_2_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_5.j
deleted file mode 100644
index 1680575..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_5.j
+++ /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_dload_2_5.java
-.class public dxc/junit/opcodes/dload_2/jm/T_dload_2_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 4
-
-    dconst_1
-    dstore_2
-    
-    dload_2
-    dload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_5.java
deleted file mode 100644
index 96be034..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_5.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 dxc.junit.opcodes.dload_2.jm;
-
-public class T_dload_2_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_6.j
deleted file mode 100644
index 64411be..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_6.j
+++ /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_dload_2_6.java
-.class public dxc/junit/opcodes/dload_2/jm/T_dload_2_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_2
-
-    dload_2
-    dload 2
-    dcmpl 
-    
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_6.java
deleted file mode 100644
index e98944a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_2/jm/T_dload_2_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 dxc.junit.opcodes.dload_2.jm;
-
-public class T_dload_2_6 {
-
-    public static boolean run() {
-        double i = 1d;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/Test_dload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/Test_dload_3.java
deleted file mode 100644
index 8d88d4e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/Test_dload_3.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dload_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dload_3.jm.T_dload_3_1;
-import dxc.junit.opcodes.dload_3.jm.T_dload_3_6;
-
-public class Test_dload_3 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(1d, T_dload_3_1.run());
-    }
-
-    /**
-     * @title equality of dload_<n> and dload <n>
-     */
-    public void testN2() {
-        assertTrue(T_dload_3_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_3.jm.T_dload_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_3.jm.T_dload_3_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_3.jm.T_dload_3_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dload_3.jm.T_dload_3_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_1.j
deleted file mode 100644
index 3e4ec5d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dload_3_1.java
-.class public dxc/junit/opcodes/dload_3/jm/T_dload_3_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 5
-    
-    dconst_1
-    dstore_3
-    dconst_0
-    dload_3
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_1.java
deleted file mode 100644
index a5cb748..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_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 dxc.junit.opcodes.dload_3.jm;
-
-public class T_dload_3_1 {
-
-    public static double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_2.j
deleted file mode 100644
index 5d3d072..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dload_3_2.java
-.class public dxc/junit/opcodes/dload_3/jm/T_dload_3_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    dload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_2.java
deleted file mode 100644
index da11e14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_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 dxc.junit.opcodes.dload_3.jm;
-
-public class T_dload_3_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_3.j
deleted file mode 100644
index 8558fa9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_3.j
+++ /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_dload_3_3.java
-.class public dxc/junit/opcodes/dload_3/jm/T_dload_3_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    fconst_1
-    fstore_3
-    fconst_1
-    fstore 4
-    
-    dload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_3.java
deleted file mode 100644
index 1534e50..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_3.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 dxc.junit.opcodes.dload_3.jm;
-
-public class T_dload_3_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_4.j
deleted file mode 100644
index 28fce45..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_4.j
+++ /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_dload_3_4.java
-.class public dxc/junit/opcodes/dload_3/jm/T_dload_3_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    lconst_1
-    lstore_3
-    
-    dload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_4.java
deleted file mode 100644
index 6b22af4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_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 dxc.junit.opcodes.dload_3.jm;
-
-public class T_dload_3_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_5.j
deleted file mode 100644
index b9ceac4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_5.j
+++ /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_dload_3_5.java
-.class public dxc/junit/opcodes/dload_3/jm/T_dload_3_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 5
-
-    dconst_1
-    dstore_3
-    
-    dload_3
-    dload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_5.java
deleted file mode 100644
index 48b7cfe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_5.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 dxc.junit.opcodes.dload_3.jm;
-
-public class T_dload_3_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_6.j
deleted file mode 100644
index eecc7a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_6.j
+++ /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_dload_3_6.java
-.class public dxc/junit/opcodes/dload_3/jm/T_dload_3_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 5
-
-    dconst_1
-    dstore_3
-
-    dload_3
-    dload 3
-    dcmpl 
-    
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_6.java
deleted file mode 100644
index 4be5f77..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dload_3/jm/T_dload_3_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 dxc.junit.opcodes.dload_3.jm;
-
-public class T_dload_3_6 {
-
-    public static boolean run() {
-        double i = 1d;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/Test_dmul.java b/tools/dx-tests/src/dxc/junit/opcodes/dmul/Test_dmul.java
deleted file mode 100644
index 4f0c55b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/Test_dmul.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dmul;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dmul.jm.T_dmul_1;
-
-public class Test_dmul extends DxTestCase {
-
-    /**
-     * @title  Arguments = 2.7d, 3.14d
-     */
-
-    public void testN1() {
-        T_dmul_1 t = new T_dmul_1();
-        assertEquals(8.478000000000002d, t.run(2.7d, 3.14d));
-    }
-
-    /**
-     * @title  Arguments = 0, -3.14d
-     */
-    public void testN2() {
-        T_dmul_1 t = new T_dmul_1();
-        assertEquals(-0d, t.run(0, -3.14d));
-    }
-
-    /**
-     * @title  Arguments = -2.7d, -3.14d
-     */
-    public void testN3() {
-        T_dmul_1 t = new T_dmul_1();
-        assertEquals(8.478000000000002d, t.run(-3.14d, -2.7d));
-    }
-
-    /**
-     * @title  Arguments = Double.MAX_VALUE, Double.NaN
-     */
-    public void testB1() {
-        T_dmul_1 t = new T_dmul_1();
-        assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY, 0
-     */
-    public void testB2() {
-        T_dmul_1 t = new T_dmul_1();
-        assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY, 0));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY, -2.7d
-     */
-    public void testB3() {
-        T_dmul_1 t = new T_dmul_1();
-        assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
-                -2.7d));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY,
-     * Double.NEGATIVE_INFINITY
-     */
-    public void testB4() {
-        T_dmul_1 t = new T_dmul_1();
-        assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
-                Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = +0, -0d
-     */
-    public void testB5() {
-        T_dmul_1 t = new T_dmul_1();
-        assertEquals(-0d, t.run(+0d, -0d));
-    }
-
-    /**
-     * @title  Arguments = -0d, -0d
-     */
-    public void testB6() {
-        T_dmul_1 t = new T_dmul_1();
-        assertEquals(+0d, t.run(-0d, -0d));
-    }
-
-    /**
-     * @title  Arguments = Double.MAX_VALUE, Double.MAX_VALUE
-     */
-    public void testB7() {
-        T_dmul_1 t = new T_dmul_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_dmul_1 t = new T_dmul_1();
-        assertEquals(-0d, t.run(Double.MIN_VALUE, -1.4E-45f));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dmul.jm.T_dmul_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dmul.jm.T_dmul_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dmul.jm.T_dmul_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double, reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dmul.jm.T_dmul_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_1.j
deleted file mode 100644
index 4bd9247..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dmul_1.java
-.class public dxc/junit/opcodes/dmul/jm/T_dmul_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-    dload_1
-    dload_3
-    dmul
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_1.java
deleted file mode 100644
index c4ad6fb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_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 dxc.junit.opcodes.dmul.jm;
-
-public class T_dmul_1 {
-
-    public double run(double a, double b) {
-        return a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_2.j
deleted file mode 100644
index 744f9ae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dmul_2.java
-.class public dxc/junit/opcodes/dmul/jm/T_dmul_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-    dload_1
-    ; dload_3   
-    dmul
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_2.java
deleted file mode 100644
index 7616c9e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_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 dxc.junit.opcodes.dmul.jm;
-
-public class T_dmul_2 {
-
-    public double run(double a, double b) {
-        return a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_3.j
deleted file mode 100644
index 222294b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dmul_3.java
-.class public dxc/junit/opcodes/dmul/jm/T_dmul_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FD)F
-    .limit stack 4
-    .limit locals 5
-    fload_1
-    dload_2    
-    dmul
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_3.java
deleted file mode 100644
index 7732dbd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_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 dxc.junit.opcodes.dmul.jm;
-
-public class T_dmul_3 {
-
-    public double run(float a, double b) {
-        return (double)a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_4.j
deleted file mode 100644
index 376b985..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_4.j
+++ /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_dmul_4.java
-.class public dxc/junit/opcodes/dmul/jm/T_dmul_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JD)D
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-;    l2d
-    dload_3
-    dmul
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_4.java
deleted file mode 100644
index 7fe4ff0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_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 dxc.junit.opcodes.dmul.jm;
-
-public class T_dmul_4 {
-
-    public double run(long a, double b) {
-        return (double)a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_5.j
deleted file mode 100644
index c6783ca..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dmul_5.java
-.class public dxc/junit/opcodes/dmul/jm/T_dmul_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-
-    dload_1
-    aload_0
-    dmul
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_5.java
deleted file mode 100644
index d4c5811..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dmul/jm/T_dmul_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 dxc.junit.opcodes.dmul.jm;
-
-public class T_dmul_5 {
-    
-    public double run(double a, double b) {
-        return a*b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/Test_dneg.java b/tools/dx-tests/src/dxc/junit/opcodes/dneg/Test_dneg.java
deleted file mode 100644
index 6f17737..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/Test_dneg.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 dxc.junit.opcodes.dneg;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dneg.jm.T_dneg_1;
-
-public class Test_dneg extends DxTestCase {
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN1() {
-        T_dneg_1 t = new T_dneg_1();
-        assertEquals(-1d, t.run(1d));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN2() {
-        T_dneg_1 t = new T_dneg_1();
-        assertEquals(1d, t.run(-1d));
-    }
-
-    /**
-     * @title  Argument = +0
-     */
-    public void testN3() {
-        T_dneg_1 t = new T_dneg_1();
-        assertEquals(-0d, t.run(+0d));
-    }
-
-    /**
-     * @title  Argument = -2.7
-     */
-    public void testN4() {
-        T_dneg_1 t = new T_dneg_1();
-        assertEquals(2.7d, t.run(-2.7d));
-    }
-
-
-    /**
-     * @title  Argument = Double.NaN
-     */
-    public void testB1() {
-        T_dneg_1 t = new T_dneg_1();
-        assertEquals(Double.NaN, t.run(Double.NaN));
-    }
-
-    /**
-     * @title  Argument = Double.NEGATIVE_INFINITY
-     */
-    public void testB2() {
-        T_dneg_1 t = new T_dneg_1();
-        assertEquals(Double.POSITIVE_INFINITY, t.run(Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Argument = Double.POSITIVE_INFINITY
-     */
-    public void testB3() {
-        T_dneg_1 t = new T_dneg_1();
-        assertEquals(Double.NEGATIVE_INFINITY, t.run(Double.POSITIVE_INFINITY));
-    }
-
-    /**
-     * @title  Argument = Double.MAX_VALUE
-     */
-    public void testB4() {
-        T_dneg_1 t = new T_dneg_1();
-        assertEquals(-1.7976931348623157E308d, t.run(Double.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Double.MIN
-     */
-    public void testB5() {
-        T_dneg_1 t = new T_dneg_1();
-        assertEquals(-4.9E-324d, t.run(Double.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dneg.jm.T_dneg_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dneg.jm.T_dneg_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dneg.jm.T_dneg_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dneg.jm.T_dneg_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_1.j
deleted file mode 100644
index 17acbbb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_1.j
+++ /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 T_ineg_1.java
-.class public dxc/junit/opcodes/dneg/jm/T_dneg_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)D
-    .limit stack 2
-    .limit locals 3
-    dload_1
-    dneg
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_1.java
deleted file mode 100644
index 9b33e9b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_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 dxc.junit.opcodes.dneg.jm;
-
-public class T_dneg_1 {
-
-    public double run(double d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_2.j
deleted file mode 100644
index 7f8266c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_2.j
+++ /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 T_dneg_2.java
-.class public dxc/junit/opcodes/dneg/jm/T_dneg_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)D
-    .limit stack 2
-    .limit locals 2
-    ;dload_1
-    dneg
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_2.java
deleted file mode 100644
index 27ec6ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_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 dxc.junit.opcodes.dneg.jm;
-
-public class T_dneg_2 {
-
-    public double run(double d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_3.j
deleted file mode 100644
index 98aa60e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dneg_3.java
-.class public dxc/junit/opcodes/dneg/jm/T_dneg_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)D
-    .limit stack 2
-    .limit locals 3
-
-    fconst_1
-    dneg
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_3.java
deleted file mode 100644
index c7a68a3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_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 dxc.junit.opcodes.dneg.jm;
-
-public class T_dneg_3 {
-
-    public double run(double d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_4.j
deleted file mode 100644
index fbbac9e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_4.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dneg_4.java
-.class public dxc/junit/opcodes/dneg/jm/T_dneg_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)D
-    .limit stack 2
-    .limit locals 3
-
-    lconst_1
-    dneg
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_4.java
deleted file mode 100644
index ee85927..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_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 dxc.junit.opcodes.dneg.jm;
-
-public class T_dneg_4 {
-
-    public double run(double d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_5.j
deleted file mode 100644
index 6e7874d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_5.j
+++ /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_dneg_5.java
-.class public dxc/junit/opcodes/dneg/jm/T_dneg_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)D
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    dneg
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_5.java
deleted file mode 100644
index 1fb3c3d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dneg/jm/T_dneg_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 dxc.junit.opcodes.dneg.jm;
-
-public class T_dneg_5 {
-    
-    public double run(double d) {
-        return -d;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/Test_drem.java b/tools/dx-tests/src/dxc/junit/opcodes/drem/Test_drem.java
deleted file mode 100644
index f8a9de5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/Test_drem.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.drem;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.drem.jm.T_drem_1;
-
-public class Test_drem extends DxTestCase {
-
-    /**
-     * @title Arguments = 2.7d, 3.14d
-     */
-    public void testN1() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(2.7d, t.run(2.7d, 3.14d));
-    }
-
-    /**
-     * @title  Dividend = 0
-     */
-    public void testN2() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(0d, t.run(0, 3.14d));
-    }
-
-    /**
-     * @title  Dividend is negative
-     */
-    public void testN3() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(-0.43999999999999995d, t.run(-3.14d, 2.7d));
-    }
-
-    /**
-     * @title  Arguments = Double.MAX_VALUE, Double.NaN
-     */
-    public void testB1() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY,
-     * Double.NEGATIVE_INFINITY
-     */
-    public void testB2() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
-                Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY, -2.7d
-     */
-    public void testB3() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY, -2.7d));
-    }
-
-    /**
-     * @title  Arguments = -2.7d, Double.NEGATIVE_INFINITY
-     */
-    public void testB4() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(-2.7d, t.run(-2.7d, Double.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = 0, 0
-     */
-    public void testB5() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(Double.NaN, t.run(0, 0));
-    }
-
-    /**
-     * @title  Arguments = 0, -2.7
-     */
-    public void testB6() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(0d, t.run(0, -2.7d));
-    }
-
-    /**
-     * @title  Arguments = -2.7, 0
-     */
-    public void testB7() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(Double.NaN, t.run(-2.7d, 0));
-    }
-
-    /**
-     * @title  Arguments = 1, Double.MAX_VALUE
-     */
-    public void testB8() {
-        T_drem_1 t = new T_drem_1();
-        assertEquals(0d, t.run(1, Double.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Double.MAX_VALUE, -1E-9d
-     */
-    public void testB9() {
-        T_drem_1 t = new T_drem_1();
-
-        assertEquals(1.543905285031139E-10d, t.run(Double.MAX_VALUE, -1E-9d));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.drem.jm.T_drem_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.drem.jm.T_drem_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.drem.jm.T_drem_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double, reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.drem.jm.T_drem_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_1.j b/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_1.j
deleted file mode 100644
index 15501a1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_drem_1.java
-.class public dxc/junit/opcodes/drem/jm/T_drem_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-    dload_1
-    dload_3
-    drem
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_1.java b/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_1.java
deleted file mode 100644
index 36f7787..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_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 dxc.junit.opcodes.drem.jm;
-
-public class T_drem_1 {
-
-    public double run(double a, double b) {
-        return a%b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_2.j b/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_2.j
deleted file mode 100644
index 1c256c2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_drem_2.java
-.class public dxc/junit/opcodes/drem/jm/T_drem_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-    dload_1
-    ; dload_3    
-    drem
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_2.java b/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_2.java
deleted file mode 100644
index 5268322..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_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 dxc.junit.opcodes.drem.jm;
-
-public class T_drem_2 {
-
-    public double run(double a, double b) {
-        return a%b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_3.j b/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_3.j
deleted file mode 100644
index f0cc9668..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_drem_3.java
-.class public dxc/junit/opcodes/drem/jm/T_drem_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FD)D
-    .limit stack 3
-    .limit locals 5
-    fload_1
-    dload_2    
-    drem
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_3.java b/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_3.java
deleted file mode 100644
index 2687fec..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_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 dxc.junit.opcodes.drem.jm;
-
-public class T_drem_3 {
-
-    public double run(double a, float b) {
-        return a%(double)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_4.j b/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_4.j
deleted file mode 100644
index 8b9dc80..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_drem_4.java
-.class public dxc/junit/opcodes/drem/jm/T_drem_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JD)D
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-;    l2d
-    dload_3
-    drem
-
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_4.java b/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_4.java
deleted file mode 100644
index bf104e9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_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 dxc.junit.opcodes.drem.jm;
-
-public class T_drem_4 {
-
-    public double run(long a, double b) {
-        return (double)a%b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_5.j b/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_5.j
deleted file mode 100644
index 75dc941..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_drem_5.java
-.class public dxc/junit/opcodes/drem/jm/T_drem_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-
-    dload_1
-    aload_0
-    drem
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_5.java b/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_5.java
deleted file mode 100644
index 2d3f76b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/drem/jm/T_drem_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 dxc.junit.opcodes.drem.jm;
-
-public class T_drem_5 {
-    
-    public double run(double a, double b) {
-        return a%b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/Test_dreturn.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/Test_dreturn.java
deleted file mode 100644
index 90e9e7a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/Test_dreturn.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dreturn;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dreturn.jm.T_dreturn_1;
-import dxc.junit.opcodes.dreturn.jm.T_dreturn_6;
-import dxc.junit.opcodes.dreturn.jm.T_dreturn_7;
-import dxc.junit.opcodes.dreturn.jm.T_dreturn_8;
-import dxc.junit.opcodes.dreturn.jm.T_dreturn_9;
-
-public class Test_dreturn extends DxTestCase {
-
-    /**
-     * @title  simple
-     */
-    public void testN1() {
-        T_dreturn_1 t = new T_dreturn_1();
-        assertEquals(123456d, t.run());
-    }
-
-    /**
-     * @title  check that frames are discarded and reinstananted correctly
-     */
-    public void testN2() {
-        T_dreturn_6 t = new T_dreturn_6();
-        assertEquals(123456d, t.run());
-    }
-
-    /**
-     * @title  check that monitor is released by dreturn
-     */
-    public void testN3() {
-        assertTrue(T_dreturn_7.execute());
-    }
-
-
-    /**
-     * @title  Method is synchronized but thread is not monitor owner
-     */
-    public void testE1() {
-        T_dreturn_8 t = new T_dreturn_8();
-        try {
-            assertTrue(t.run());
-            fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Lock structural rule 1 is violated
-     */
-    public void testE2() {
-        T_dreturn_9 t = new T_dreturn_9();
-        try {
-            assertEquals(1d, t.run());
-            // the JVM spec says that it is optional to implement the structural
-            // lock rules, see JVM spec 8.13 and monitorenter/exit opcodes.
-            System.out.print("dvmvfe:");
-            //fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - void
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dreturn.jm.T_dreturn_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dreturn.jm.T_dreturn_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dreturn.jm.T_dreturn_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dreturn.jm.T_dreturn_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.dreturn.jm.T_dreturn_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.dreturn.jm.T_dreturn_11");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_1.j
deleted file mode 100644
index b4c8d87..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_1.j
+++ /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_dreturn_1.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()D
-    .limit stack 2
-    ldc2_w 123456.0
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_1.java
deleted file mode 100644
index 2f6e798..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_1 {
-
-    public double run() {
-        return 123456d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_10.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_10.j
deleted file mode 100644
index fbfd76a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_10.j
+++ /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_dreturn_10.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_10
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private static test()D
-    .limit stack 2
-    .limit locals 0
-    dconst_1
-    dreturn
-.end method
-
-
-
-.method public run()D
-    .limit stack 0
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/dreturn/jm/T_dreturn_10/test()D
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_10.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_10.java
deleted file mode 100644
index 49208c7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_10.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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_10 {
-    
-    private static double test() {
-        return 1d;
-    }
-    
-    public double run() {
-        return test();
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_11.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_11.j
deleted file mode 100644
index ed2f42a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_11.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dreturn_11.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()D
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_11.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_11.java
deleted file mode 100644
index ed86640..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_11 {
-    
-    public double run() {
-        return 0d;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_2.j
deleted file mode 100644
index 19a7298..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_2.j
+++ /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_dreturn_2.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    dconst_0
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_2.java
deleted file mode 100644
index 3d2bc88..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_2 {
-
-    public double run() {
-        return 0d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_3.j
deleted file mode 100644
index 0a80e55..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_3.j
+++ /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_dreturn_3.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()F
-    .limit stack 2
-    .limit locals 1
-
-    dconst_0
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_3.java
deleted file mode 100644
index dac5e4e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_3 {
-
-    public double run() {
-        return 0d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_4.j
deleted file mode 100644
index 811f72c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_4.j
+++ /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_dreturn_4.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()D
-    .limit stack 2
-    .limit locals 1
-
-    ;dconst_0
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_4.java
deleted file mode 100644
index 8e3b4ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_4 {
-
-    public double run() {
-        return 0d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_5.j
deleted file mode 100644
index 3a666f5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_5.j
+++ /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_dreturn_5.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()D
-    .limit stack 2
-    .limit locals 1
-
-    fconst_0
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_5.java
deleted file mode 100644
index 62063b1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_5 {
-
-    public double run() {
-        return 0d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_6.j
deleted file mode 100644
index 4f72ff5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_6.j
+++ /dev/null
@@ -1,90 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dreturn_6.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()D
-    .limit locals 12
-    .limit stack 6
-    
-    dconst_1
-    dstore_1
-    ldc2_w 2.0
-    dstore_3
-    ldc2_w 3.0
-    dstore 5
-    
-    ldc2_w 4.0
-    
-    invokestatic dxc/junit/opcodes/dreturn/jm/T_dreturn_6/test()D
-    
-    ldc2_w 4444.0
-    dcmpl
-    ifne Label1
-    
-    ldc2_w 4.0
-    dcmpl
-    ifne Label0
-    
-    dload_1
-    dconst_1
-    dcmpl
-    ifne Label0
-    
-    dload_3
-    ldc2_w 2.0
-    dcmpl
-    ifne Label0
-    
-    dload 5
-    ldc2_w 3.0
-    dcmpl
-    ifne Label0    
-    
-    ldc2_w 123456.0
-    dreturn
-
-Label1:
-    pop2
-Label0:
-    dconst_0
-    dreturn
-
-.end method
-
-.method private static test()D
-    .limit locals 8
-    .limit stack 4
-    
-    ldc2_w 1111.0
-    dstore_1
-    ldc2_w 2222.0
-    dstore_3
-    ldc2_w 3333.0
-    dstore 5
-    
-    ldc2_w 5555.0
-    
-    ldc2_w 4444.0
-    dreturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_6.java
deleted file mode 100644
index e3c2681..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_6 {
-
-    public double run() {
-        return 123456d;
-    }
-    
-    private static double test() {
-        double a = 1111d;
-        double b = 2222d;
-        double c = 3333d;
-        return 4444d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_7.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_7.j
deleted file mode 100644
index 2297b9f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_7.j
+++ /dev/null
@@ -1,166 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dreturn_7.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_7
-.super java/lang/Object
-.implements java/lang/Runnable
-
-.field  value D
-.field  failed Z
-
-.method public <init>()V
-    .limit stack 3
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    dconst_0
-    putfield dxc.junit.opcodes.dreturn.jm.T_dreturn_7.value D
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.dreturn.jm.T_dreturn_7.failed Z
-
-    return
-
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-   
-    iconst_0
-    istore_1
-
-Label4:
-    iload_1
-    sipush 1000
-    if_icmpge Label3
-
-    aload_0
-    invokespecial dxc/junit/opcodes/dreturn/jm/T_dreturn_7/test()D
-    pop2
-
-    iinc 1 1
-
-    goto Label4
-
-
-Label3:
-    return
-
-.end method
-
-
-
-.method private synchronized test()D
-    .limit stack 5
-    .limit locals 3
-    
-.line 16
-    aload_0
-    dup
-    getfield dxc.junit.opcodes.dreturn.jm.T_dreturn_7.value D
-    dup2
-    dstore_1
-
-    dconst_1
-    dadd
-    putfield dxc.junit.opcodes.dreturn.jm.T_dreturn_7.value D
-
-    dload_1
-    dconst_1
-    dadd
-    dstore_1
-
-    invokestatic java/lang/Thread/yield()V
-
-    dload_1
-    aload_0
-    getfield dxc.junit.opcodes.dreturn.jm.T_dreturn_7.value D
-    dcmpl
-    ifeq Label0
-
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.dreturn.jm.T_dreturn_7.failed Z
-
-Label0:
-    dload_1
-    dreturn
-.end method
-
-
-
-.method public static execute()Z
-    .limit stack 5
-    .limit locals 4
-
-    new dxc/junit/opcodes/dreturn/jm/T_dreturn_7
-    dup
-    invokespecial dxc/junit/opcodes/dreturn/jm/T_dreturn_7/<init>()V
-    astore_0
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_1
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_2
-
-    aload_1
-    invokevirtual java/lang/Thread/start()V
-
-    aload_2
-    invokevirtual java/lang/Thread/start()V
-
-Label12:
-    ldc2_w 5000
-    invokestatic java/lang/Thread/sleep(J)V
-
-Label13:
-    goto Label0
-
-Label14:            ; exception handler
-    astore_3
-    goto Label3
-
-Label0:
-    aload_0
-    getfield dxc.junit.opcodes.dreturn.jm.T_dreturn_7.value D
-    ldc2_w 2000.0
-    dcmpl
-    ifne Label3
-
-    aload_0
-    getfield dxc.junit.opcodes.dreturn.jm.T_dreturn_7.failed Z
-    ifne Label3
-
-    iconst_1
-    ireturn
-
-Label3:
-    iconst_0
-    ireturn
-
-.catch java/lang/InterruptedException from Label12 to Label13 using Label14
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_7.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_7.java
deleted file mode 100644
index d02da66..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_7.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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_7 implements Runnable {
-    public final static int CNT = 1000;
-    double value = 0;
-    boolean failed = false;
-    
-    public void run() {
-        for(int i = 0; i < CNT; i++) {
-            test();
-        }
-    }
-    
-    private synchronized double test()    {
-        value++;
-        double c = value;
-        Thread.yield();
-        if(c != value)
-            failed = true;
-        return c;
-    }
-    
-    public static boolean execute() {
-        T_dreturn_7 test = new T_dreturn_7();
-        Thread t1 = new Thread(test);
-        Thread t2 = new Thread(test);
-        
-        t1.start();
-        t2.start();
-        
-        try
-        {
-            Thread.sleep(5000);
-        }
-        catch(InterruptedException ie) {
-            return false;
-        }
-        
-        if(test.value != CNT * 2)
-            return false;
-        return !test.failed;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_8.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_8.j
deleted file mode 100644
index 9b8b0b9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_8.j
+++ /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_dreturn_8.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private synchronized test()D
-    .limit stack 2
-    aload_0
-    monitorexit
-       dconst_0
-    dreturn
-.end method
-
-
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial dxc/junit/opcodes/dreturn/jm/T_dreturn_8/test()D
-    pop2
-
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_8.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_8.java
deleted file mode 100644
index 27aa409..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_8.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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_8 {
-    
-    private synchronized double test() {
-        return 0d;
-    }
-    
-    public boolean run() {
-        test();
-        return true;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_9.j b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_9.j
deleted file mode 100644
index 2895b44..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dreturn_9.java
-.class public dxc/junit/opcodes/dreturn/jm/T_dreturn_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()D
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    monitorenter
-
-    dconst_1
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_9.java b/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_9.java
deleted file mode 100644
index 9d9c41d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dreturn/jm/T_dreturn_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 dxc.junit.opcodes.dreturn.jm;
-
-public class T_dreturn_9 {
-    
-    public double run() {
-        return 1d;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/Test_dstore.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/Test_dstore.java
deleted file mode 100644
index 3288dd7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/Test_dstore.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dstore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dstore.jm.T_dstore_1;
-import dxc.junit.opcodes.dstore.jm.T_dstore_1_w;
-import dxc.junit.opcodes.dstore.jm.T_dstore_5;
-import dxc.junit.opcodes.dstore.jm.T_dstore_5_w;
-
-public class Test_dstore extends DxTestCase {
-
-    /*
-     * NORMAL dstore VERSION
-     */
-
-    /**
-     * @title  dstore 0
-     */
-    public void testN1() {
-        assertEquals(1d, T_dstore_1.run());
-    }
-
-    /**
-     * @title  dstore 255
-     */
-    public void testN2() {
-        assertEquals(1d, T_dstore_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore.jm.T_dstore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore.jm.T_dstore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore.jm.T_dstore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE dstore VERSION
-     */
-
-    /**
-     * @title  dstore_w 0
-     */
-    public void testN3() {
-        assertEquals(1d, T_dstore_1_w.run());
-    }
-
-    /**
-     * @title  dstore 257
-     */
-    public void testN4() {
-        assertEquals(1d, T_dstore_5_w.run());
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore.jm.T_dstore_2_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore.jm.T_dstore_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore.jm.T_dstore_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1.j
deleted file mode 100644
index dfc1a4e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_1.java
-.class public dxc/junit/opcodes/dstore/jm/T_dstore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 2
-    
-    dconst_1
-    dstore 0
-    dconst_0
-    dload 0
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1.java
deleted file mode 100644
index 211bf9e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_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 dxc.junit.opcodes.dstore.jm;
-
-public class T_dstore_1 {
-
-    public static double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1_w.j
deleted file mode 100644
index 3bd52da..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_1_w.java
-.class public dxc/junit/opcodes/dstore/jm/T_dstore_1_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 2
-    
-    dconst_1
-    dstore_w 0
-    dconst_0
-    dload 0
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1_w.java
deleted file mode 100644
index c855bb4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_1_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dstore.jm;
-
-public class T_dstore_1_w {
-
-    public static double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2.j
deleted file mode 100644
index 1e7e045..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_2.java
-.class public dxc/junit/opcodes/dstore/jm/T_dstore_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    dstore 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2.java
deleted file mode 100644
index 1a3e865..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_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 dxc.junit.opcodes.dstore.jm;
-
-public class T_dstore_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2_w.j
deleted file mode 100644
index 95c3b6c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_2_w.java
-.class public dxc/junit/opcodes/dstore/jm/T_dstore_2_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    dstore_w 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2_w.java
deleted file mode 100644
index 9db43ff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_2_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dstore.jm;
-
-public class T_dstore_2_w {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3.j
deleted file mode 100644
index ca8d79f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_3.java
-.class public dxc/junit/opcodes/dstore/jm/T_dstore_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    dstore 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3.java
deleted file mode 100644
index f858789..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3.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 dxc.junit.opcodes.dstore.jm;
-
-public class T_dstore_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3_w.j
deleted file mode 100644
index 9f90254..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_3_w.java
-.class public dxc/junit/opcodes/dstore/jm/T_dstore_3_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    dstore_w 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3_w.java
deleted file mode 100644
index e0d3e8f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_3_w.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 dxc.junit.opcodes.dstore.jm;
-
-public class T_dstore_3_w {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4.j
deleted file mode 100644
index 45912a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_4.java
-.class public dxc/junit/opcodes/dstore/jm/T_dstore_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    dstore 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4.java
deleted file mode 100644
index 8aef1df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_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 dxc.junit.opcodes.dstore.jm;
-
-public class T_dstore_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4_w.j
deleted file mode 100644
index 95fc6f6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_4_w.java
-.class public dxc/junit/opcodes/dstore/jm/T_dstore_4_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    dstore_w 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4_w.java
deleted file mode 100644
index 0e34bdd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_4_w.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 dxc.junit.opcodes.dstore.jm;
-
-public class T_dstore_4_w {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5.j
deleted file mode 100644
index b92bac5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_5.java
-.class public dxc/junit/opcodes/dstore/jm/T_dstore_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 300
-    
-    dconst_1
-    dstore 255
-    dconst_0
-    dload 255
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5.java
deleted file mode 100644
index 5bfd48b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_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 dxc.junit.opcodes.dstore.jm;
-
-public class T_dstore_5 {
-
-    public static double run() {
-        return 1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5_w.j
deleted file mode 100644
index 3efeed0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_5_w.java
-.class public dxc/junit/opcodes/dstore/jm/T_dstore_5_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 300
-    
-    dconst_1
-    dstore_w 257
-    dconst_0
-    dload 257
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5_w.java
deleted file mode 100644
index 6a5bf97..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore/jm/T_dstore_5_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dstore.jm;
-
-public class T_dstore_5_w {
-
-    public static double run() {
-        return 1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/Test_dstore_0.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/Test_dstore_0.java
deleted file mode 100644
index c365e69..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/Test_dstore_0.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dstore_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dstore_0.jm.T_dstore_0_1;
-import dxc.junit.opcodes.dstore_0.jm.T_dstore_0_5;
-
-public class Test_dstore_0 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals(1d, T_dstore_0_1.run());
-    }
-
-    /**
-     * @title equality of dstore_<n> and dstore <n>
-     */
-    public void testN2() {
-        assertTrue(T_dstore_0_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_0.jm.T_dstore_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_0.jm.T_dstore_0_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_0.jm.T_dstore_0_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_1.j
deleted file mode 100644
index c145f7f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_0_1.java
-.class public dxc/junit/opcodes/dstore_0/jm/T_dstore_0_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 2
-    
-    dconst_1
-    dstore_0
-    dconst_0
-    dload_0
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_1.java
deleted file mode 100644
index 225c851..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_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 dxc.junit.opcodes.dstore_0.jm;
-
-public class T_dstore_0_1 {
-
-    public static double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_2.j
deleted file mode 100644
index 2fc0cf3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_0_2.java
-.class public dxc/junit/opcodes/dstore_0/jm/T_dstore_0_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    dstore_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_2.java
deleted file mode 100644
index 468a023..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_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 dxc.junit.opcodes.dstore_0.jm;
-
-public class T_dstore_0_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_3.j
deleted file mode 100644
index a401b73..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_0_3.java
-.class public dxc/junit/opcodes/dstore_0/jm/T_dstore_0_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    dstore_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_3.java
deleted file mode 100644
index d22bee4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_3.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 dxc.junit.opcodes.dstore_0.jm;
-
-public class T_dstore_0_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_4.j
deleted file mode 100644
index c3ad00d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_0_4.java
-.class public dxc/junit/opcodes/dstore_0/jm/T_dstore_0_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    dstore_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_4.java
deleted file mode 100644
index 80fd08e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_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 dxc.junit.opcodes.dstore_0.jm;
-
-public class T_dstore_0_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_5.j
deleted file mode 100644
index 6a7124b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_5.j
+++ /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_dstore_0_5.java
-.class public dxc/junit/opcodes/dstore_0/jm/T_dstore_0_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 2
-
-    dconst_1
-    dstore_0
-    dload_0
-
-    dconst_1
-    dstore 0
-    dload_0
-    
-    dcmpl
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_5.java
deleted file mode 100644
index e0596d4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_0/jm/T_dstore_0_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 dxc.junit.opcodes.dstore_0.jm;
-
-public class T_dstore_0_5 {
-
-    public static boolean run() {
-        double i = 2d;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/Test_dstore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/Test_dstore_1.java
deleted file mode 100644
index 54dda38..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/Test_dstore_1.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dstore_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dstore_1.jm.T_dstore_1_1;
-import dxc.junit.opcodes.dstore_1.jm.T_dstore_1_5;
-
-public class Test_dstore_1 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals(1d, T_dstore_1_1.run());
-    }
-
-    /**
-     * @title equality of dstore_<n> and dstore <n>
-     */
-    public void testN2() {
-        assertTrue(T_dstore_1_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_1.jm.T_dstore_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_1.jm.T_dstore_1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_1.jm.T_dstore_1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_1.j
deleted file mode 100644
index 99f316a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_1_1.java
-.class public dxc/junit/opcodes/dstore_1/jm/T_dstore_1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 3
-    
-    dconst_1
-    dstore_1
-    dconst_0
-    dload_1
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_1.java
deleted file mode 100644
index f57c81b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_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 dxc.junit.opcodes.dstore_1.jm;
-
-public class T_dstore_1_1 {
-
-    public static double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_2.j
deleted file mode 100644
index 32d1a60..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_1_2.java
-.class public dxc/junit/opcodes/dstore_1/jm/T_dstore_1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    dstore_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_2.java
deleted file mode 100644
index 292b860..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_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 dxc.junit.opcodes.dstore_1.jm;
-
-public class T_dstore_1_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_3.j
deleted file mode 100644
index 6dd7feb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_1_3.java
-.class public dxc/junit/opcodes/dstore_1/jm/T_dstore_1_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    dstore_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_3.java
deleted file mode 100644
index 3f55d47..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_3.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 dxc.junit.opcodes.dstore_1.jm;
-
-public class T_dstore_1_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_4.j
deleted file mode 100644
index bfce7ba..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_1_4.java
-.class public dxc/junit/opcodes/dstore_1/jm/T_dstore_1_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    dstore_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_4.java
deleted file mode 100644
index 242e0a5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_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 dxc.junit.opcodes.dstore_1.jm;
-
-public class T_dstore_1_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_5.j
deleted file mode 100644
index 12dd5a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_5.j
+++ /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_dstore_1_5.java
-.class public dxc/junit/opcodes/dstore_1/jm/T_dstore_1_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 3
-
-    dconst_1
-    dstore_1
-    dload_1
-
-    dconst_1
-    dstore 1
-    dload_1
-    
-    dcmpl
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_5.java
deleted file mode 100644
index 492506a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_1/jm/T_dstore_1_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 dxc.junit.opcodes.dstore_1.jm;
-
-public class T_dstore_1_5 {
-
-    public static boolean run() {
-        double i = 2d;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/Test_dstore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/Test_dstore_2.java
deleted file mode 100644
index c00b007..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/Test_dstore_2.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dstore_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dstore_2.jm.T_dstore_2_1;
-import dxc.junit.opcodes.dstore_2.jm.T_dstore_2_5;
-
-public class Test_dstore_2 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals(1d, T_dstore_2_1.run());
-    }
-
-    /**
-     * @title equality of dstore_<n> and dstore <n>
-     */
-    public void testN2() {
-        assertTrue(T_dstore_2_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_2.jm.T_dstore_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_2.jm.T_dstore_2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_2.jm.T_dstore_2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_1.j
deleted file mode 100644
index c2a76bb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_2_1.java
-.class public dxc/junit/opcodes/dstore_2/jm/T_dstore_2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 4
-    
-    dconst_1
-    dstore_2
-    dconst_0
-    dload_2
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_1.java
deleted file mode 100644
index ab0b839..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_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 dxc.junit.opcodes.dstore_2.jm;
-
-public class T_dstore_2_1 {
-
-    public static double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_2.j
deleted file mode 100644
index 4f07c20..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_2_2.java
-.class public dxc/junit/opcodes/dstore_2/jm/T_dstore_2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    dstore_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_2.java
deleted file mode 100644
index 3fc3729..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_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 dxc.junit.opcodes.dstore_2.jm;
-
-public class T_dstore_2_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_3.j
deleted file mode 100644
index 07f8d4d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_2_3.java
-.class public dxc/junit/opcodes/dstore_2/jm/T_dstore_2_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    dstore_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_3.java
deleted file mode 100644
index 3e29214..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_3.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 dxc.junit.opcodes.dstore_2.jm;
-
-public class T_dstore_2_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_4.j
deleted file mode 100644
index eba9a71..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_2_4.java
-.class public dxc/junit/opcodes/dstore_2/jm/T_dstore_2_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    dstore_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_4.java
deleted file mode 100644
index 3b9bb03..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_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 dxc.junit.opcodes.dstore_2.jm;
-
-public class T_dstore_2_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_5.j
deleted file mode 100644
index 1b9a614..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_5.j
+++ /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_dstore_2_5.java
-.class public dxc/junit/opcodes/dstore_2/jm/T_dstore_2_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_2
-    dload_2
-
-    dconst_1
-    dstore 2
-    dload_2
-    
-    dcmpl
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_5.java
deleted file mode 100644
index 556be2c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_2/jm/T_dstore_2_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 dxc.junit.opcodes.dstore_2.jm;
-
-public class T_dstore_2_5 {
-
-    public static boolean run() {
-        double i = 2d;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/Test_dstore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/Test_dstore_3.java
deleted file mode 100644
index 860a614..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/Test_dstore_3.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dstore_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dstore_3.jm.T_dstore_3_1;
-import dxc.junit.opcodes.dstore_3.jm.T_dstore_3_5;
-
-public class Test_dstore_3 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals(1d, T_dstore_3_1.run());
-    }
-
-    /**
-     * @title equality of dstore_<n> and dstore <n>
-     */
-    public void testN2() {
-        assertTrue(T_dstore_3_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_3.jm.T_dstore_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_3.jm.T_dstore_3_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dstore_3.jm.T_dstore_3_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_1.j
deleted file mode 100644
index 3738af3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_3_1.java
-.class public dxc/junit/opcodes/dstore_3/jm/T_dstore_3_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()D
-    .limit stack 4
-    .limit locals 5
-    
-    dconst_1
-    dstore_3
-    dconst_0
-    dload_3
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_1.java
deleted file mode 100644
index 847e07a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_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 dxc.junit.opcodes.dstore_3.jm;
-
-public class T_dstore_3_1 {
-
-    public static double run() {
-        return 1d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_2.j
deleted file mode 100644
index 626d1e4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_3_2.java
-.class public dxc/junit/opcodes/dstore_3/jm/T_dstore_3_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    dstore_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_2.java
deleted file mode 100644
index 21293d2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_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 dxc.junit.opcodes.dstore_3.jm;
-
-public class T_dstore_3_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_3.j
deleted file mode 100644
index 9d232e7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_3_3.java
-.class public dxc/junit/opcodes/dstore_3/jm/T_dstore_3_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    fconst_1
-    dstore_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_3.java
deleted file mode 100644
index b0ac2a0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_3.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 dxc.junit.opcodes.dstore_3.jm;
-
-public class T_dstore_3_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_4.j
deleted file mode 100644
index 2250519..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dstore_3_4.java
-.class public dxc/junit/opcodes/dstore_3/jm/T_dstore_3_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    lconst_1
-    dstore_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_4.java
deleted file mode 100644
index 7f1a8d4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_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 dxc.junit.opcodes.dstore_3.jm;
-
-public class T_dstore_3_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_5.j
deleted file mode 100644
index 4808894..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_5.j
+++ /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_dstore_3_5.java
-.class public dxc/junit/opcodes/dstore_3/jm/T_dstore_3_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 5
-
-    dconst_1
-    dstore_3
-    dload_3
-
-    dconst_1
-    dstore 3
-    dload_3
-    
-    dcmpl
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_5.java
deleted file mode 100644
index f1b6ce4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dstore_3/jm/T_dstore_3_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 dxc.junit.opcodes.dstore_3.jm;
-
-public class T_dstore_3_5 {
-
-    public static boolean run() {
-        double i = 2d;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/Test_dsub.java b/tools/dx-tests/src/dxc/junit/opcodes/dsub/Test_dsub.java
deleted file mode 100644
index 25ae6eb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/Test_dsub.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dsub;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dsub.jm.T_dsub_1;
-
-public class Test_dsub extends DxTestCase {
-
-    /**
-     * @title  Arguments = 2.7d, 3.14d
-     */
-    public void testN1() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(-0.43999999999999995d, t.run(2.7d, 3.14d));
-    }
-
-    /**
-     * @title  Arguments = 0, -3.14d
-     */
-    public void testN2() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(3.14d, t.run(0, -3.14d));
-    }
-
-    /**
-     * @title Arguments = -3.14d, -2.7d
-     */
-    public void testN3() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(-0.43999999999999995d, t.run(-3.14d, -2.7d));
-    }
-
-    /**
-     * @title  Arguments = Double.MAX_VALUE, Double.NaN
-     */
-    public void testB1() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(Double.NaN, t.run(Double.MAX_VALUE, Double.NaN));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY,
-     * Double.NEGATIVE_INFINITY
-     */
-    public void testB2() {
-        T_dsub_1 t = new T_dsub_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_dsub_1 t = new T_dsub_1();
-        assertEquals(Double.NaN, t.run(Double.POSITIVE_INFINITY,
-                Double.POSITIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = Double.POSITIVE_INFINITY, -2.7d
-     */
-    public void testB4() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(Double.POSITIVE_INFINITY, t.run(Double.POSITIVE_INFINITY,
-                -2.7d));
-    }
-
-    /**
-     * @title  Arguments = +0, -0d
-     */
-    public void testB5() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(+0d, t.run(+0d, -0d));
-    }
-
-    /**
-     * @title  Arguments = -0d, -0d
-     */
-    public void testB6() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(0d, t.run(-0d, -0d));
-    }
-
-    /**
-     * @title  Arguments = +0d, +0d
-     */
-    public void testB7() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(+0d, t.run(+0d, +0d));
-    }
-
-    /**
-     * @title  Arguments = 2.7d, 2.7d
-     */
-    public void testB8() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(0d, t.run(2.7d, 2.7d));
-    }
-
-    /**
-     * @title  Arguments = Double.MAX_VALUE, Double.MAX_VALUE
-     */
-    public void testB9() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(0d, t.run(Double.MAX_VALUE, Double.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Double.MIN_VALUE, 4.9E-324
-     */
-    public void testB10() {
-        T_dsub_1 t = new T_dsub_1();
-        assertEquals(0d, t.run(Double.MIN_VALUE, 4.9E-324));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dsub.jm.T_dsub_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dsub.jm.T_dsub_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dsub.jm.T_dsub_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double, reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dsub.jm.T_dsub_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_1.j
deleted file mode 100644
index 62af343..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dsub_1.java
-.class public dxc/junit/opcodes/dsub/jm/T_dsub_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-    dload_1
-    dload_3
-    dsub
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_1.java
deleted file mode 100644
index ab16ff8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_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 dxc.junit.opcodes.dsub.jm;
-
-public class T_dsub_1 {
-
-    public double run(double a, double b) {
-        return a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_2.j
deleted file mode 100644
index 988f027..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dsub_2.java
-.class public dxc/junit/opcodes/dsub/jm/T_dsub_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-    dload_1
-    ; dload_3    
-    dsub
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_2.java
deleted file mode 100644
index f85699e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_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 dxc.junit.opcodes.dsub.jm;
-
-public class T_dsub_2 {
-
-    public double run(double a, double b) {
-        return a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_3.j
deleted file mode 100644
index 0e6e7db..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dsub_3.java
-.class public dxc/junit/opcodes/dsub/jm/T_dsub_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FD)D
-    .limit stack 4
-    .limit locals 5
-    fload_1
-    dload_2    
-    dsub
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_3.java
deleted file mode 100644
index e57d3c1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_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 dxc.junit.opcodes.dsub.jm;
-
-public class T_dsub_3 {
-
-    public double run(float a, double b) {
-        return (double)a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_4.j
deleted file mode 100644
index e592dc3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dsub_4.java
-.class public dxc/junit/opcodes/dsub/jm/T_dsub_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JD)D
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    dload_3
-    dsub
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_4.java
deleted file mode 100644
index 3dcd8c8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_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 dxc.junit.opcodes.dsub.jm;
-
-public class T_dsub_4 {
-
-    public double run(long a, double b) {
-        return (double)a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_5.j
deleted file mode 100644
index b83d875..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dsub_5.java
-.class public dxc/junit/opcodes/dsub/jm/T_dsub_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DD)D
-    .limit stack 4
-    .limit locals 5
-
-    dload_1
-    aload_0
-    dsub
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_5.java
deleted file mode 100644
index 47ee270..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dsub/jm/T_dsub_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 dxc.junit.opcodes.dsub.jm;
-
-public class T_dsub_5 {
-    
-    public double run(double a, double b) {
-        return a-b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/Test_dup.java b/tools/dx-tests/src/dxc/junit/opcodes/dup/Test_dup.java
deleted file mode 100644
index 5e84815..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/Test_dup.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dup;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dup.jm.T_dup_1;
-import dxc.junit.opcodes.dup.jm.T_dup_6;
-import dxc.junit.opcodes.dup.jm.T_dup_7;
-
-
-public class Test_dup extends DxTestCase {
-
-    /**
-     * @title  type of argument - int
-     */
-    public void testN1() {
-        T_dup_1 t = new T_dup_1();
-        assertTrue(t.run());
-    }
-    
-    /**
-     * @title  type of argument - float
-     */
-    public void testN2() {
-        T_dup_6 t = new T_dup_6();
-        assertTrue(t.run());
-    }
-    
-    /**
-     * @title  type of argument - reference
-     */
-    public void testN3() {
-        T_dup_7 t = new T_dup_7();
-        assertTrue(t.run());
-    }
-    
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments 
-     */
-    public void testVFE1() {
-        try
-        {
-            Class.forName("dxc.junit.opcodes.dup.jm.T_dup_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-    
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double 
-     */
-    public void testVFE2() {
-        try
-        {
-            Class.forName("dxc.junit.opcodes.dup.jm.T_dup_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-    
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long 
-     */
-    public void testVFE3() {
-        try
-        {
-            Class.forName("dxc.junit.opcodes.dup.jm.T_dup_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try
-        {
-            Class.forName("dxc.junit.opcodes.dup.jm.T_dup_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_1.j
deleted file mode 100644
index c1b71e5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_1.j
+++ /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_dup_1.java
-.class public dxc/junit/opcodes/dup/jm/T_dup_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    iconst_4
-    dup
-    if_icmpeq Label1
-    
-    iconst_0
-    ireturn
-    
-Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_1.java
deleted file mode 100644
index c1d2de7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_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 dxc.junit.opcodes.dup.jm;
-
-public class T_dup_1 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_2.j
deleted file mode 100644
index fc18b59..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup_2.java
-.class public dxc/junit/opcodes/dup/jm/T_dup_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    ; iconst_4
-    dup
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_2.java
deleted file mode 100644
index a9729cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_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 dxc.junit.opcodes.dup.jm;
-
-public class T_dup_2 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_3.j
deleted file mode 100644
index 4414dc2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup_3.java
-.class public dxc/junit/opcodes/dup/jm/T_dup_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 3
-    .limit locals 3
-    dconst_1
-    dup
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_3.java
deleted file mode 100644
index 07c156d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_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 dxc.junit.opcodes.dup.jm;
-
-public class T_dup_3 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_4.j
deleted file mode 100644
index a200e95..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup_4.java
-.class public dxc/junit/opcodes/dup/jm/T_dup_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1
-    dup
-
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_4.java
deleted file mode 100644
index f5a1819..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_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 dxc.junit.opcodes.dup.jm;
-
-public class T_dup_4 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_5.j
deleted file mode 100644
index a346cd4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_5.j
+++ /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_dup_5.java
-.class public dxc/junit/opcodes/dup/jm/T_dup_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 1
-    .limit locals 1
-    
-    iconst_4
-    dup
-
-    if_icmpeq Label1
-    
-    iconst_0
-    ireturn
-    
-Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_5.java
deleted file mode 100644
index 28e1688..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_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 dxc.junit.opcodes.dup.jm;
-
-public class T_dup_5 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_6.j
deleted file mode 100644
index 46c002a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_6.j
+++ /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_dup_6.java
-.class public dxc/junit/opcodes/dup/jm/T_dup_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    fconst_2
-    dup
-    fcmpl
-    ifeq Label1
-    
-    iconst_0
-    ireturn
-    
-Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_6.java
deleted file mode 100644
index 1ff2719..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_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 dxc.junit.opcodes.dup.jm;
-
-public class T_dup_6 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_7.j b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_7.j
deleted file mode 100644
index 2e31bb8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_7.j
+++ /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_dup_7.java
-.class public dxc/junit/opcodes/dup/jm/T_dup_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    aload_0
-    dup
-    if_acmpeq Label1
-    
-    iconst_0
-    ireturn
-    
-Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_7.java b/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_7.java
deleted file mode 100644
index 17d9abe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup/jm/T_dup_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 dxc.junit.opcodes.dup.jm;
-
-public class T_dup_7 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/Test_dup2.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2/Test_dup2.java
deleted file mode 100644
index c73ef3b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/Test_dup2.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dup2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dup2.jm.T_dup2_1;
-import dxc.junit.opcodes.dup2.jm.T_dup2_3;
-import dxc.junit.opcodes.dup2.jm.T_dup2_4;
-import dxc.junit.opcodes.dup2.jm.T_dup2_6;
-
-public class Test_dup2 extends DxTestCase {
-
-    /**
-     * @title  type of argument - int, int
-     */
-    public void testN1() {
-        T_dup2_1 t = new T_dup2_1();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - float, float
-     */
-    public void testN2() {
-        T_dup2_6 t = new T_dup2_6();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - double, int
-     */
-    public void testN3() {
-        T_dup2_3 t = new T_dup2_3();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - long, int
-     */
-    public void testN4() {
-        T_dup2_4 t = new T_dup2_4();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup2.jm.T_dup2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup2.jm.T_dup2_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_1.j
deleted file mode 100644
index 07a81b8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_1.j
+++ /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_dup2_1.java
-.class public dxc/junit/opcodes/dup2/jm/T_dup2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 5
-    .limit locals 2
-    
-    iconst_3
-    iconst_4
-    dup2            
-    
-    iconst_4
-    if_icmpne Label3
-    
-    iconst_3
-    if_icmpne Label2
-    
-    iconst_4
-    if_icmpne Label1
-    
-    iconst_3
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-
-Label3:
-    pop
-Label2:
-    pop
-Label1:
-    pop
-Label0:
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_1.java
deleted file mode 100644
index b72b82d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_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 dxc.junit.opcodes.dup2.jm;
-
-public class T_dup2_1 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_2.j
deleted file mode 100644
index e7ad7f2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup2_2.java
-.class public dxc/junit/opcodes/dup2/jm/T_dup2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()Z
-    .limit stack 5
-    .limit locals 2
-    iconst_4
-    dup2
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_2.java
deleted file mode 100644
index c2d0e43..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_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 dxc.junit.opcodes.dup2.jm;
-
-public class T_dup2_2 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_3.j
deleted file mode 100644
index 5f526d4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_3.j
+++ /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_dup2_3.java
-.class public dxc/junit/opcodes/dup2/jm/T_dup2_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 6
-    .limit locals 3
-    dconst_1
-    dup2
-    
-    dcmpl
-    ifne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_3.java
deleted file mode 100644
index aa2ac10..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_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 dxc.junit.opcodes.dup2.jm;
-
-public class T_dup2_3 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_4.j
deleted file mode 100644
index 9424ac6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_4.j
+++ /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_dup2_4.java
-.class public dxc/junit/opcodes/dup2/jm/T_dup2_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 6
-    .limit locals 3
-    lconst_1
-    dup2
-    
-    lcmp
-    ifne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_4.java
deleted file mode 100644
index f451f5a2d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_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 dxc.junit.opcodes.dup2.jm;
-
-public class T_dup2_4 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_5.j
deleted file mode 100644
index 757caaa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_5.j
+++ /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_dup2_5.java
-.class public dxc/junit/opcodes/dup2/jm/T_dup2_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 1
-    
-    iconst_3
-    iconst_4
-    dup2
-
-    if_icmpeq Label1
-    
-    iconst_0
-    ireturn
-    
-Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_5.java
deleted file mode 100644
index 2af55a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_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 dxc.junit.opcodes.dup2.jm;
-
-public class T_dup2_5 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_6.j
deleted file mode 100644
index d68f7b0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_6.j
+++ /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_dup2_6.java
-.class public dxc/junit/opcodes/dup2/jm/T_dup2_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 5
-    .limit locals 2
-    
-    fconst_0
-    fconst_1
-    dup2
-    
-    fconst_1
-    fcmpl
-    ifne Label3
-    
-    fconst_0
-    fcmpl
-    ifne Label2
-    
-    fconst_1
-    fcmpl
-    ifne Label1
-    
-    fconst_0
-    fcmpl
-    ifne Label0
-    
-    iconst_1
-    ireturn
-
-Label3:
-    pop
-Label2:
-    pop    
-Label1:
-    pop
-Label0:
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_6.java
deleted file mode 100644
index 9fa9ff1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2/jm/T_dup2_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 dxc.junit.opcodes.dup2.jm;
-
-public class T_dup2_6 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/Test_dup2_x1.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/Test_dup2_x1.java
deleted file mode 100644
index 2ba5c11..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/Test_dup2_x1.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dup2_x1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dup2_x1.jm.T_dup2_x1_1;
-import dxc.junit.opcodes.dup2_x1.jm.T_dup2_x1_3;
-import dxc.junit.opcodes.dup2_x1.jm.T_dup2_x1_4;
-import dxc.junit.opcodes.dup2_x1.jm.T_dup2_x1_6;
-
-public class Test_dup2_x1 extends DxTestCase {
-
-    /**
-     * @title  type of argument - int, int, int
-     */
-    public void testN1() {
-        T_dup2_x1_1 t = new T_dup2_x1_1();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - float, float, float
-     */
-    public void testN2() {
-        T_dup2_x1_6 t = new T_dup2_x1_6();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - double, int
-     */
-    public void testN3() {
-        T_dup2_x1_3 t = new T_dup2_x1_3();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title type of argument - long, int
-     */
-    public void testN4() {
-        T_dup2_x1_4 t = new T_dup2_x1_4();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup2_x1.jm.T_dup2_x1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup2_x1.jm.T_dup2_x1_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_1.j
deleted file mode 100644
index 6d2c106..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_1.j
+++ /dev/null
@@ -1,59 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup2_x1_1.java
-.class public dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 8
-    .limit locals 2
-    
-    iconst_3
-    iconst_4
-    iconst_5    ; 3 4 5
-    dup2_x1        ; 4 5 3 4 5
-    iconst_5
-    if_icmpne Label4    ; 4 5 3 4
-    iconst_4
-    if_icmpne Label3    ; 4 5 3 
-    iconst_3
-    if_icmpne Label2    ; 4 5 
-    iconst_5
-    if_icmpne Label1    ; 4
-    iconst_4
-    if_icmpne Label0    ; 
-
-    iconst_1
-    ireturn
-    
-Label4:
-    pop
-Label3:
-    pop
-Label2:
-    pop
-Label1:
-    pop
-Label0:    
-    iconst_0
-    ireturn
-        
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_1.java
deleted file mode 100644
index 471e097..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_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 dxc.junit.opcodes.dup2_x1.jm;
-
-public class T_dup2_x1_1 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_2.j
deleted file mode 100644
index fbdd36b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_2.j
+++ /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_dup2_x1_2.java
-.class public dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()Z
-    .limit stack 4
-    .limit locals 2
-    iconst_3
-    iconst_4
-    ;iconst_5
-    dup2_x1
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_2.java
deleted file mode 100644
index afa7a67..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_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 dxc.junit.opcodes.dup2_x1.jm;
-
-public class T_dup2_x1_2 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_3.j
deleted file mode 100644
index 23c3cf8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_3.j
+++ /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 T_dup2_x1_3.java
-.class public dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 8
-    .limit locals 3
-    
-    iconst_5
-    dconst_1
-    dup2_x1        ; [1] 5 [1]
-    
-    dconst_1    ; [1] 5 [1] [1]
-    dcmpl        ; [1] 5
-    ifne Label2
-    iconst_5    ; [1] 5 5
-    if_icmpne Label1
-       dconst_1    ; [1][1]
-    dcmpl        ; 
-    ifne Label0
-    
-    iconst_1
-    ireturn
-    
- Label2:
-     pop
- Label1:
-     pop2
- Label0:
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_3.java
deleted file mode 100644
index fdd9b7b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_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 dxc.junit.opcodes.dup2_x1.jm;
-
-public class T_dup2_x1_3 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_4.j
deleted file mode 100644
index c719ab6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_4.j
+++ /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 T_dup2_x1_4.java
-.class public dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 8
-    .limit locals 3
-    
-    iconst_5
-    lconst_1
-    dup2_x1        ; [1] 5 [1]
-    
-    lconst_1    ; [1] 5 [1] [1]
-    lcmp        ; [1] 5
-    ifne Label2
-    iconst_5    ; [1] 5 5
-    if_icmpne Label1
-       lconst_1    ; [1][1]
-    lcmp        ; 
-    ifne Label0
-    
-    iconst_1
-    ireturn
-    
- Label2:
-     pop
- Label1:
-     pop2
- Label0:
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_4.java
deleted file mode 100644
index 92e6cd2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_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 dxc.junit.opcodes.dup2_x1.jm;
-
-public class T_dup2_x1_4 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_5.j
deleted file mode 100644
index 81a5836..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_5.j
+++ /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_dup2_x1_5.java
-.class public dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 4
-    .limit locals 1
-    
-    iconst_3
-    iconst_4
-    iconst_5
-    dup2_x1
-
-    if_icmpeq Label1
-    
-    iconst_0
-    ireturn
-    
-Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_5.java
deleted file mode 100644
index 46036a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_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 dxc.junit.opcodes.dup2_x1.jm;
-
-public class T_dup2_x1_5 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_6.j
deleted file mode 100644
index 45cd2b2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_6.j
+++ /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_dup2_x1_6.java
-.class public dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 8
-    .limit locals 2
-    
-    fconst_0
-    fconst_1
-    fconst_2    ; 0 1 2
-    dup2_x1        ; 1 2 0 1 2
-    fconst_2
-    fcmpl         ; 1 2 0 1
-    ifne Label4    
-    fconst_1
-    fcmpl         ; 1 2 0 
-    ifne Label3    
-    fconst_0
-    fcmpl         ; 1 2 
-    ifne Label2    
-    fconst_2
-    fcmpl         ; 1
-    ifne Label1    
-    fconst_1
-    fcmpl         ;
-    ifne Label0     
-
-    iconst_1
-    ireturn
-    
-Label4:
-    pop
-Label3:
-    pop
-Label2:
-    pop
-Label1:
-    pop
-Label0:    
-    iconst_0
-    ireturn
-        
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_6.java
deleted file mode 100644
index 050d49c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x1/jm/T_dup2_x1_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 dxc.junit.opcodes.dup2_x1.jm;
-
-public class T_dup2_x1_6 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/Test_dup2_x2.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/Test_dup2_x2.java
deleted file mode 100644
index e211f3e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/Test_dup2_x2.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dup2_x2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dup2_x2.jm.T_dup2_x2_1;
-import dxc.junit.opcodes.dup2_x2.jm.T_dup2_x2_2;
-import dxc.junit.opcodes.dup2_x2.jm.T_dup2_x2_3;
-import dxc.junit.opcodes.dup2_x2.jm.T_dup2_x2_4;
-import dxc.junit.opcodes.dup2_x2.jm.T_dup2_x2_5;
-
-public class Test_dup2_x2 extends DxTestCase {
-
-    /**
-     * @title  type of argument - int, int, int, int
-     */
-    public void testN1() {
-        T_dup2_x2_1 t = new T_dup2_x2_1();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - float, float, float, float
-     */
-    public void testN2() {
-        T_dup2_x2_2 t = new T_dup2_x2_2();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - double, float, int
-     */
-    public void testN3() {
-        T_dup2_x2_3 t = new T_dup2_x2_3();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title type of argument - int, float, long
-     */
-    public void testN4() {
-        T_dup2_x2_4 t = new T_dup2_x2_4();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title type of argument - double, long
-     */
-    public void testN5() {
-        T_dup2_x2_5 t = new T_dup2_x2_5();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup2_x2.jm.T_dup2_x2_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup2_x2.jm.T_dup2_x2_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_1.j
deleted file mode 100644
index b7be303..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_1.j
+++ /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_dup2_x2_1.java
-.class public dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 8
-    .limit locals 2
-    
-    iconst_2
-    iconst_3
-    iconst_4
-    iconst_5    ; 2 3 4 5
-    dup2_x2        ; 4 5 2 3 4 5
-    iconst_5
-    if_icmpne Label5    ; 4 5 2 3 4 
-    iconst_4
-    if_icmpne Label4    ; 4 5 2 3 
-    iconst_3
-    if_icmpne Label3    ; 4 5 2 
-    iconst_2
-    if_icmpne Label2    ; 4 5
-    iconst_5
-    if_icmpne Label1    ; 4
-    iconst_4
-    if_icmpne Label0    ; 4
-
-    iconst_1
-    ireturn
-   
-Label5:
-    pop 
-Label4:
-    pop
-Label3:
-    pop
-Label2:
-    pop
-Label1:
-    pop
-Label0:    
-    iconst_0
-    ireturn
-        
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_1.java
deleted file mode 100644
index 3d02ff3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_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 dxc.junit.opcodes.dup2_x2.jm;
-
-public class T_dup2_x2_1 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_2.j
deleted file mode 100644
index aa231cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_2.j
+++ /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_dup2_x2_2.java
-.class public dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 8
-    .limit locals 2
-    
-    fconst_2
-    ldc 3.0f
-    ldc 4.0f
-    ldc 5.0f    ; 2 3 4 5
-    dup2_x2        ; 4 5 2 3 4 5
-    
-    ldc 5.0f
-    fcmpl        ; 4 5 2 3 4
-    ifne Label5
-
-    ldc 4.0f
-    fcmpl        ; 4 5 2 3
-    ifne Label4
-         
-    ldc 3.0f
-    fcmpl        ; 4 5 2
-    ifne Label3
-
-    fconst_2
-    fcmpl        ; 4 5
-    ifne Label2
-    
-    ldc 5.0f
-    fcmpl        ; 4
-    ifne Label1
-    
-    ldc 4.0f
-    fcmpl        ;
-    ifne Label0
-
-    iconst_1
-    ireturn
-   
-Label5:
-    pop 
-Label4:
-    pop
-Label3:
-    pop
-Label2:
-    pop
-Label1:
-    pop
-Label0:    
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_2.java
deleted file mode 100644
index 12f6dbd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_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 dxc.junit.opcodes.dup2_x2.jm;
-
-public class T_dup2_x2_2 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_3.j
deleted file mode 100644
index 6c42a29..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_3.j
+++ /dev/null
@@ -1,66 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup2_x2_3.java
-.class public dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 8
-    .limit locals 2
-    
-    ldc2_w 3.0d
-    ldc 4.0f
-    iconst_5    ; [3] 4.0 5
-    dup2_x2        ; 4.0 5 [3] 4.0 5
-    
-    iconst_5
-    if_icmpne Label4    ; 4.0 5 [3] 4.0
-
-    ldc 4.0f
-    fcmpl        ; 4.0 5 [3]
-    ifne Label3
-         
-    ldc2_w 3.0d
-    dcmpl        ; 4.0 5
-    ifne Label2
-
-    iconst_5
-    if_icmpne Label1 ; 4.0
-    
-    ldc 4.0f
-    fcmpl        ;
-    ifne Label0
-
-    iconst_1
-    ireturn
-   
-Label4:
-    pop
-Label3:
-    pop2
-Label2:
-    pop
-Label1:
-    pop
-Label0:    
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_3.java
deleted file mode 100644
index e714059..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_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 dxc.junit.opcodes.dup2_x2.jm;
-
-public class T_dup2_x2_3 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_4.j
deleted file mode 100644
index 61533bf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_4.j
+++ /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_dup2_x2_4.java
-.class public dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 8
-    .limit locals 2
-    
-    iconst_3
-    ldc 4.0f
-    ldc2_w 5    ; 3 4.0 [5]
-    dup2_x2        ; [5] 3 4.0 [5]
-    
-    ldc2_w 5
-    lcmp
-    ifne Label3    ; [5] 3 4.0
-
-    ldc 4.0f
-    fcmpl        ; [5] 3
-    ifne Label2
-         
-    iconst_3
-    if_icmpne Label1 ; [5]
-
-    ldc2_w 5
-    lcmp        ;
-    ifne Label0
-
-    iconst_1
-    ireturn
-   
-Label3:
-    pop
-Label2:
-    pop
-Label1:
-    pop2
-Label0:    
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_4.java
deleted file mode 100644
index 64f1368..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_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 dxc.junit.opcodes.dup2_x2.jm;
-
-public class T_dup2_x2_4 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_5.j
deleted file mode 100644
index 58b4209..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_5.j
+++ /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_dup2_x2_5.java
-.class public dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 8
-    .limit locals 2
-    
-    ldc2_w 4.0d
-    ldc2_w 5    ; [4.] [5]
-    dup2_x2        ; [5] [4.] [5]
-    
-    ldc2_w 5
-    lcmp
-    ifne Label2    ; [5] [4.]
-
-    ldc2_w 4.0d
-    dcmpl        ; [5]
-    ifne Label1
-         
-    ldc2_w 5
-    lcmp        ;
-    ifne Label0
-
-    iconst_1
-    ireturn
-   
-Label2:
-    pop2
-Label1:
-    pop2
-Label0:    
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_5.java
deleted file mode 100644
index e3ba641..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_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 dxc.junit.opcodes.dup2_x2.jm;
-
-public class T_dup2_x2_5 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_6.j
deleted file mode 100644
index 1912e5e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_6.j
+++ /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_dup2_x2_6.java
-.class public dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()Z
-    .limit stack 8
-    .limit locals 2
-    iconst_2
-    iconst_3
-    iconst_4
-    ;iconst_5
-    dup2_x2
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_6.java
deleted file mode 100644
index a38100d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_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 dxc.junit.opcodes.dup2_x2.jm;
-
-public class T_dup2_x2_6 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_7.j b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_7.j
deleted file mode 100644
index d4a70f2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_7.j
+++ /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_dup2_x2_7.java
-.class public dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 5
-    .limit locals 1
-    
-    iconst_2
-    iconst_3
-    iconst_4
-    iconst_5
-    dup2_x2
-
-    if_icmpeq Label1
-    
-    iconst_0
-    ireturn
-    
-Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_7.java b/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_7.java
deleted file mode 100644
index cf71ad1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup2_x2/jm/T_dup2_x2_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 dxc.junit.opcodes.dup2_x2.jm;
-
-public class T_dup2_x2_7 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/Test_dup_x1.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/Test_dup_x1.java
deleted file mode 100644
index 6e3f57e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/Test_dup_x1.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 dxc.junit.opcodes.dup_x1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dup_x1.jm.T_dup_x1_1;
-import dxc.junit.opcodes.dup_x1.jm.T_dup_x1_6;
-import dxc.junit.opcodes.dup_x1.jm.T_dup_x1_7;
-import dxc.junit.opcodes.dup_x1.jm.T_dup_x1_8;
-
-public class Test_dup_x1 extends DxTestCase {
-
-    /**
-     * @title  type of argument - int, int
-     */
-    public void testN1() {
-        T_dup_x1_1 t = new T_dup_x1_1();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - float, float
-     */
-    public void testN2() {
-        T_dup_x1_6 t = new T_dup_x1_6();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - float, int
-     */
-    public void testN3() {
-        T_dup_x1_7 t = new T_dup_x1_7();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - reference
-     */
-    public void testN4() {
-        T_dup_x1_8 t = new T_dup_x1_8();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup_x1.jm.T_dup_x1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup_x1.jm.T_dup_x1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup_x1.jm.T_dup_x1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup_x1.jm.T_dup_x1_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_1.j
deleted file mode 100644
index 4dc02d2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_1.j
+++ /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_dup_x1_1.java
-.class public dxc/junit/opcodes/dup_x1/jm/T_dup_x1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 4
-    .limit locals 2
-    
-    iconst_4
-    iconst_5
-    dup_x1
-    
-    iconst_5
-    if_icmpne Label2
-
-    iconst_4
-    if_icmpne Label1
-
-    iconst_5
-    if_icmpne Label0
-
-    iconst_1
-    ireturn
-
-Label2:
-    pop
-Label1:
-    pop
-Label0:    
-    iconst_0
-    ireturn
-        
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_1.java
deleted file mode 100644
index 01af921..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_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 dxc.junit.opcodes.dup_x1.jm;
-
-public class T_dup_x1_1 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_2.j
deleted file mode 100644
index fd6f37b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup_x1_2.java
-.class public dxc/junit/opcodes/dup_x1/jm/T_dup_x1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()Z
-    .limit stack 4
-    .limit locals 2
-    iconst_4
-    ;iconst_5
-    dup_x1
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_2.java
deleted file mode 100644
index 8a21b44..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_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 dxc.junit.opcodes.dup_x1.jm;
-
-public class T_dup_x1_2 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_3.j
deleted file mode 100644
index f009a81..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup_x1_3.java
-.class public dxc/junit/opcodes/dup_x1/jm/T_dup_x1_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 3
-    .limit locals 3
-    dconst_1
-    dup_x1
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_3.java
deleted file mode 100644
index 58ab4cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_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 dxc.junit.opcodes.dup_x1.jm;
-
-public class T_dup_x1_3 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_4.j
deleted file mode 100644
index e6eaece..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup_x1_4.java
-.class public dxc/junit/opcodes/dup_x1/jm/T_dup_x1_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1
-    dup_x1
-
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_4.java
deleted file mode 100644
index db5cbc3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_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 dxc.junit.opcodes.dup_x1.jm;
-
-public class T_dup_x1_4 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_5.j
deleted file mode 100644
index 79c3d8c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_5.j
+++ /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_dup_x1_5.java
-.class public dxc/junit/opcodes/dup_x1/jm/T_dup_x1_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 1
-    
-    iconst_4
-    iconst_5
-    dup_x1
-
-    if_icmpeq Label1
-    
-    iconst_0
-    ireturn
-    
-Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_5.java
deleted file mode 100644
index b1cc14a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_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 dxc.junit.opcodes.dup_x1.jm;
-
-public class T_dup_x1_5 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_6.j
deleted file mode 100644
index 32d43ff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_6.j
+++ /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_dup_x1_6.java
-.class public dxc/junit/opcodes/dup_x1/jm/T_dup_x1_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 4
-    .limit locals 2
-    
-    fconst_2
-    fconst_1
-    dup_x1
-    
-    fconst_1
-    fcmpl
-    ifne Label2
-    
-    fconst_2
-    fcmpl
-    ifne Label1
-
-    fconst_1
-    fcmpl
-    ifne Label0
-
-    iconst_1
-    ireturn
-    
-Label2:
-    pop
-Label1:
-    pop
-Label0:
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_6.java
deleted file mode 100644
index 63d7511..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_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 dxc.junit.opcodes.dup_x1.jm;
-
-public class T_dup_x1_6 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_7.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_7.j
deleted file mode 100644
index 6f28a6c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_7.j
+++ /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_dup_x1_7.java
-.class public dxc/junit/opcodes/dup_x1/jm/T_dup_x1_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 4
-    .limit locals 2
-    
-    fconst_2
-    iconst_1
-    dup_x1
-
-    iconst_1
-    if_icmpne Label2
-        
-    fconst_2
-    fcmpl
-    ifne Label1
-    
-    iconst_1
-    if_icmpne Label0
-
-    iconst_1
-    ireturn
-    
-Label2:
-    pop    
-Label1:
-    pop
-Label0:
-    iconst_0
-    ireturn
-.end method
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_7.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_7.java
deleted file mode 100644
index ce0579d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_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 dxc.junit.opcodes.dup_x1.jm;
-
-public class T_dup_x1_7 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_8.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_8.j
deleted file mode 100644
index 726cc7c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_8.j
+++ /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_dup_x1_8.java
-.class public dxc/junit/opcodes/dup_x1/jm/T_dup_x1_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 4
-    .limit locals 2
-    
-    aload_0
-    aconst_null
-    dup_x1
-
-    aconst_null
-    if_acmpne Label2
-        
-    aload_0
-    if_acmpne Label1
-    
-    aconst_null
-    if_acmpne Label0
-
-    iconst_1
-    ireturn
-    
-Label2:
-    pop    
-Label1:
-    pop
-Label0:
-    iconst_0
-    ireturn
-.end method
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_8.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_8.java
deleted file mode 100644
index ed52228..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x1/jm/T_dup_x1_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 dxc.junit.opcodes.dup_x1.jm;
-
-public class T_dup_x1_8 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/Test_dup_x2.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/Test_dup_x2.java
deleted file mode 100644
index 38f1650..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/Test_dup_x2.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.dup_x2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.dup_x2.jm.T_dup_x2_1;
-import dxc.junit.opcodes.dup_x2.jm.T_dup_x2_6;
-import dxc.junit.opcodes.dup_x2.jm.T_dup_x2_7;
-
-public class Test_dup_x2 extends DxTestCase {
-
-    /**
-     * @title  type of argument - int, int, int
-     */
-    public void testN1() {
-        T_dup_x2_1 t = new T_dup_x2_1();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - float, float, float
-     */
-    public void testN2() {
-        T_dup_x2_6 t = new T_dup_x2_6();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  type of argument - double, int
-     */
-    public void testN3() {
-        T_dup_x2_7 t = new T_dup_x2_7();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup_x2.jm.T_dup_x2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup_x2.jm.T_dup_x2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup_x2.jm.T_dup_x2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.dup_x2.jm.T_dup_x2_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_1.j
deleted file mode 100644
index 5c24e22..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_1.j
+++ /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.
-
-.source T_dup_x2_1.java
-.class public dxc/junit/opcodes/dup_x2/jm/T_dup_x2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 5
-    .limit locals 2
-    
-    iconst_3
-    iconst_4            
-    iconst_5            ; 3 4 5
-    dup_x2                ; 5 3 4 5
-    
-    iconst_5            ; 5 3 4 5 5
-    if_icmpne Label3    ; 5 3 4
-    
-    iconst_4            ; 5 3 4 4
-    if_icmpne Label2    ; 5 3
-    
-    iconst_3            ; 5 3 3
-    if_icmpne Label1    ; 5
-    
-    iconst_5            ; 5 5 
-    if_icmpne Label0    ; 
-
-    iconst_1
-    ireturn
-    
-Label3:
-    pop
-Label2:
-    pop
-Label1:
-    pop 
-    
-Label0:    
-    iconst_0
-    ireturn
-        
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_1.java
deleted file mode 100644
index abeff61..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_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 dxc.junit.opcodes.dup_x2.jm;
-
-public class T_dup_x2_1 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_2.j
deleted file mode 100644
index 6bf6328..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup_x2_2.java
-.class public dxc/junit/opcodes/dup_x2/jm/T_dup_x2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()Z
-    .limit stack 4
-    .limit locals 2
-    iconst_4
-    ;iconst_5
-    dup_x2
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_2.java
deleted file mode 100644
index b085559..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_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 dxc.junit.opcodes.dup_x2.jm;
-
-public class T_dup_x2_2 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_3.j
deleted file mode 100644
index 10a2800..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup_x2_3.java
-.class public dxc/junit/opcodes/dup_x2/jm/T_dup_x2_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 4
-    .limit locals 3
-    dconst_1
-    dup_x2
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_3.java
deleted file mode 100644
index ff5cd9d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_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 dxc.junit.opcodes.dup_x2.jm;
-
-public class T_dup_x2_3 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_4.j
deleted file mode 100644
index db1f32b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_dup_x2_4.java
-.class public dxc/junit/opcodes/dup_x2/jm/T_dup_x2_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 4
-    .limit locals 3
-
-    lconst_1
-    dup_x2
-
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_4.java
deleted file mode 100644
index 8a66e42..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_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 dxc.junit.opcodes.dup_x2.jm;
-
-public class T_dup_x2_4 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_5.j
deleted file mode 100644
index e952b56..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_5.j
+++ /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_dup_x2_5.java
-.class public dxc/junit/opcodes/dup_x2/jm/T_dup_x2_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 3
-    .limit locals 1
-    
-    iconst_3
-    iconst_4
-    iconst_5
-    dup_x2
-
-    if_icmpeq Label1
-    
-    iconst_0
-    ireturn
-    
-Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_5.java
deleted file mode 100644
index c685f59..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_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 dxc.junit.opcodes.dup_x2.jm;
-
-public class T_dup_x2_5 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_6.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_6.j
deleted file mode 100644
index f67f224..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_6.j
+++ /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_dup_x2_6.java
-.class public dxc/junit/opcodes/dup_x2/jm/T_dup_x2_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 5
-    .limit locals 2
-    
-    fconst_0
-    fconst_1            
-    fconst_2            ; 0 1 2
-    dup_x2                ; 2 0 1 2
-    
-    fconst_2            ; 2 0 1 2 2
-    fcmpl                ; 2 0 1
-    ifne Label3    
-    
-    fconst_1            ; 2 0 1 1
-    fcmpl                ; 2 0
-    ifne Label2            
-    
-    fconst_0            ; 2 0 0
-    fcmpl                ; 2
-    ifne Label1    
-    
-    fconst_2            ; 2 2
-    fcmpl                ; 
-    ifne Label0    
-
-    iconst_1
-    ireturn
-    
-Label3:
-    pop
-Label2:
-    pop
-Label1:
-    pop 
-    
-Label0:    
-    iconst_0
-    ireturn
-        
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_6.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_6.java
deleted file mode 100644
index 352f746..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_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 dxc.junit.opcodes.dup_x2.jm;
-
-public class T_dup_x2_6 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_7.j b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_7.j
deleted file mode 100644
index 497fbca..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_7.j
+++ /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_dup_x2_7.java
-.class public dxc/junit/opcodes/dup_x2/jm/T_dup_x2_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 5
-    .limit locals 2
-    
-    dconst_1
-    iconst_3              ; [1] 3
-    dup_x2                ; 3 [1] 3
-    
-    iconst_3            ; 3 [1] 3 3
-    if_icmpne Label2    ; 3 [1]    
-    
-    dconst_1            ; 3 [1] [1]
-    dcmpl                ; 3
-    ifne Label1            
-    
-    iconst_3            ; 0
-    if_icmpne Label0    ;    
-    
-    iconst_1
-    ireturn
-    
-Label2:
-    pop2
-Label1:
-    pop 
-Label0:    
-    iconst_0
-    ireturn
-        
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_7.java b/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_7.java
deleted file mode 100644
index 3427222..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/dup_x2/jm/T_dup_x2_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 dxc.junit.opcodes.dup_x2.jm;
-
-public class T_dup_x2_7 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/Test_f2d.java b/tools/dx-tests/src/dxc/junit/opcodes/f2d/Test_f2d.java
deleted file mode 100644
index af2a661..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/Test_f2d.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 dxc.junit.opcodes.f2d;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.f2d.jm.T_f2d_1;
-
-public class Test_f2d extends DxTestCase {
-
-    /**
-     * @title  Argument = 0.5
-     */
-    public void testN1() {
-        T_f2d_1 t = new T_f2d_1();
-        assertEquals(0.5d, t.run(0.5f), 0d);
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_f2d_1 t = new T_f2d_1();
-        assertEquals(1d, t.run(1), 0d);
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_f2d_1 t = new T_f2d_1();
-        assertEquals(-1d, t.run(-1), 0d);
-    }
-
-    /**
-     * @title  Argument = Float.MAX_VALUE
-     */
-    public void testB1() {
-        T_f2d_1 t = new T_f2d_1();
-        double r = 0x1.fffffeP+127d;
-        assertEquals(r, t.run(Float.MAX_VALUE), 0d);
-    }
-
-    /**
-     * @title  Argument = Float.MIN_VALUE
-     */
-    public void testB2() {
-        T_f2d_1 t = new T_f2d_1();
-        double r = 0x0.000002P-126d;
-        assertEquals(r, t.run(Float.MIN_VALUE), 0d);
-    }
-
-    /**
-     * @title  Argument = -0
-     */
-    public void testB3() {
-        T_f2d_1 t = new T_f2d_1();
-        assertEquals(-0d, t.run(-0), 0d);
-    }
-
-    /**
-     * @title  Argument = NaN
-     */
-    public void testB4() {
-        T_f2d_1 t = new T_f2d_1();
-        assertTrue(Double.isNaN(t.run(Float.NaN)));
-    }
-
-    /**
-     * @title  Argument = POSITIVE_INFINITY
-     */
-    public void testB5() {
-        T_f2d_1 t = new T_f2d_1();
-        assertTrue(Double.isInfinite(t.run(Float.POSITIVE_INFINITY)));
-    }
-
-    /**
-     * @title  Argument = NEGATIVE_INFINITY
-     */
-    public void testB6() {
-        T_f2d_1 t = new T_f2d_1();
-        assertTrue(Double.isInfinite(t.run(Float.NEGATIVE_INFINITY)));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.f2d.jm.T_f2d_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.f2d.jm.T_f2d_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.f2d.jm.T_f2d_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.f2d.jm.T_f2d_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.f2d.jm.T_f2d_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_1.j b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_1.j
deleted file mode 100644
index 7c39854..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_1.j
+++ /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 T_f2d_1.java
-.class public dxc/junit/opcodes/f2d/jm/T_f2d_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)D
-    .limit stack 2
-    .limit locals 2
-    fload_1
-    f2d
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_1.java b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_1.java
deleted file mode 100644
index 86f6024..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_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 dxc.junit.opcodes.f2d.jm;
-
-public class T_f2d_1 {
-
-    public double run(float a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_2.j b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_2.j
deleted file mode 100644
index 27d5ce9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_2.j
+++ /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_f2d_2.java
-.class public dxc/junit/opcodes/f2d/jm/T_f2d_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(F)D
-    .limit stack 2
-    .limit locals 2
-
-;    fload_1
-    f2d
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_2.java b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_2.java
deleted file mode 100644
index 92464dd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_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 dxc.junit.opcodes.f2d.jm;
-
-public class T_f2d_2 {
-
-    public double run(float a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_3.j b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_3.j
deleted file mode 100644
index 8bd52a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_3.j
+++ /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_f2d_3.java
-.class public dxc/junit/opcodes/f2d/jm/T_f2d_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(D)D
-    .limit stack 2
-    .limit locals 3
-
-    dload_1
-    f2d
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_3.java b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_3.java
deleted file mode 100644
index 7668c19..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_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 dxc.junit.opcodes.f2d.jm;
-
-public class T_f2d_3 {
-
-    public double run(double a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_4.j b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_4.j
deleted file mode 100644
index 0535199..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_4.j
+++ /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_f2d_4.java
-.class public dxc/junit/opcodes/f2d/jm/T_f2d_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(J)D
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-;    l2f
-    f2d
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_4.java b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_4.java
deleted file mode 100644
index 21cfd1a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_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 dxc.junit.opcodes.f2d.jm;
-
-public class T_f2d_4 {
-
-    public double run(long a) {
-        return (float) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_5.j b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_5.j
deleted file mode 100644
index 4a25d44..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f2d_5.java
-.class public dxc/junit/opcodes/f2d/jm/T_f2d_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(F)D
-    .limit stack 1
-    .limit locals 2
-
-    fload_1
-    f2d
-    
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_5.java b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_5.java
deleted file mode 100644
index b01c814..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_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 dxc.junit.opcodes.f2d.jm;
-
-public class T_f2d_5 {
-
-    public double run(float a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_6.j b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_6.j
deleted file mode 100644
index 2f90d81..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_6.j
+++ /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_f2d_6.java
-.class public dxc/junit/opcodes/f2d/jm/T_f2d_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)D
-    .limit stack 2
-    .limit locals 2
-
-    aload_0
-    f2d
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_6.java b/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_6.java
deleted file mode 100644
index 8ac2102..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2d/jm/T_f2d_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 dxc.junit.opcodes.f2d.jm;
-
-public class T_f2d_6 {
-    
-    public double run(float a) {
-        return a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/Test_f2i.java b/tools/dx-tests/src/dxc/junit/opcodes/f2i/Test_f2i.java
deleted file mode 100644
index 0968e96..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/Test_f2i.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 dxc.junit.opcodes.f2i;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.f2i.jm.T_f2i_1;
-
-public class Test_f2i extends DxTestCase {
-
-    /**
-     * @title  Argument = 2.999999f
-     */
-    public void testN1() {
-        T_f2i_1 t = new T_f2i_1();
-        assertEquals(2, t.run(2.999999f));
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_f2i_1 t = new T_f2i_1();
-        assertEquals(1, t.run(1f));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_f2i_1 t = new T_f2i_1();
-        assertEquals(-1, t.run(-1f));
-    }
-
-    /**
-     * @title  Argument = -0f
-     */
-    public void testB1() {
-        T_f2i_1 t = new T_f2i_1();
-        assertEquals(0, t.run(-0f));
-    }
-
-    /**
-     * @title  Argument = Float.MAX_VALUE
-     */
-    public void testB2() {
-        T_f2i_1 t = new T_f2i_1();
-        assertEquals(Integer.MAX_VALUE, t.run(Float.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Float.MIN_VALUE
-     */
-    public void testB3() {
-        T_f2i_1 t = new T_f2i_1();
-        assertEquals(0, t.run(Float.MIN_VALUE));
-    }
-
-    /**
-     * @title  Argument = NaN
-     */
-    public void testB4() {
-        T_f2i_1 t = new T_f2i_1();
-        assertEquals(0, t.run(Float.NaN));
-    }
-
-    /**
-     * @title  Argument = POSITIVE_INFINITY
-     */
-    public void testB5() {
-        T_f2i_1 t = new T_f2i_1();
-        assertEquals(Integer.MAX_VALUE, t.run(Float.POSITIVE_INFINITY));
-    }
-
-    /**
-     * @title  Argument = NEGATIVE_INFINITY
-     */
-    public void testB6() {
-        T_f2i_1 t = new T_f2i_1();
-        assertEquals(Integer.MIN_VALUE, t.run(Float.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.f2i.jm.T_f2i_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.f2i.jm.T_f2i_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.f2i.jm.T_f2i_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.f2i.jm.T_f2i_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_1.j b/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_1.j
deleted file mode 100644
index ddc0dc0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_1.j
+++ /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 T_f2i_1.java
-.class public dxc/junit/opcodes/f2i/jm/T_f2i_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)I
-    .limit stack 2
-    .limit locals 2
-    fload_1
-    f2i
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_1.java b/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_1.java
deleted file mode 100644
index b8ae3e2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_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 dxc.junit.opcodes.f2i.jm;
-
-public class T_f2i_1 {
-
-    public int run(float a) {
-        return (int)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_2.j b/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_2.j
deleted file mode 100644
index 2676a82..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_2.j
+++ /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_f2i_2.java
-.class public dxc/junit/opcodes/f2i/jm/T_f2i_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(F)I
-    .limit stack 2
-    .limit locals 2
-
-;    fload_1
-    f2i
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_2.java b/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_2.java
deleted file mode 100644
index 888f9a9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_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 dxc.junit.opcodes.f2i.jm;
-
-public class T_f2i_2 {
-
-    public int run(float a) {
-        return (int)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_3.j b/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_3.j
deleted file mode 100644
index 8a819ae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_3.j
+++ /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_f2i_3.java
-.class public dxc/junit/opcodes/f2i/jm/T_f2i_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(D)I
-    .limit stack 2
-    .limit locals 3
- 
-    dload_1
- ;   d2f
-     f2i
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_3.java b/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_3.java
deleted file mode 100644
index fb68cc8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_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 dxc.junit.opcodes.f2i.jm;
-
-public class T_f2i_3 {
-
-    public int run(double a) {
-        return (int)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_4.j b/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_4.j
deleted file mode 100644
index 9df3571..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_4.j
+++ /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_f2i_4.java
-.class public dxc/junit/opcodes/f2i/jm/T_f2i_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(J)I
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-
-    ;l2f
-    f2i
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_4.java b/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_4.java
deleted file mode 100644
index 7f487a5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_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 dxc.junit.opcodes.f2i.jm;
-
-public class T_f2i_4 {
-
-    public int run(long a) {
-        return (int)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_5.j b/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_5.j
deleted file mode 100644
index a18e695..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_5.j
+++ /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_f2i_5.java
-.class public dxc/junit/opcodes/f2i/jm/T_f2i_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)I
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    f2i
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_5.java b/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_5.java
deleted file mode 100644
index d09408c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2i/jm/T_f2i_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 dxc.junit.opcodes.f2i.jm;
-
-public class T_f2i_5 {
-    
-    public int run(float a) {
-        return (int)a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/Test_f2l.java b/tools/dx-tests/src/dxc/junit/opcodes/f2l/Test_f2l.java
deleted file mode 100644
index ae6f98f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/Test_f2l.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 dxc.junit.opcodes.f2l;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.f2l.jm.T_f2l_1;
-
-public class Test_f2l extends DxTestCase {
-
-    /**
-     * @title  Argument = 2.999999f
-     */
-    public void testN1() {
-        T_f2l_1 t = new T_f2l_1();
-        assertEquals(2l, t.run(2.999999f));
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-         T_f2l_1 t = new T_f2l_1();
-         assertEquals(1l, t.run(1));
-    }
-    
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-         T_f2l_1 t = new T_f2l_1();
-         assertEquals(-1l, t.run(-1));
-    }
-
-    /**
-     * @title  Argument = Float.MAX_VALUE
-     */
-    public void testB1() {
-        T_f2l_1 t = new T_f2l_1();
-        assertEquals(Long.MAX_VALUE, t.run(Float.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Float.MIN_VALUE
-     */
-    public void testB2() {
-        T_f2l_1 t = new T_f2l_1();
-        assertEquals(0, t.run(Float.MIN_VALUE));
-    }
-    
-    /**
-     * @title  Argument = 0
-     */
-    public void testB3() {
-        T_f2l_1 t = new T_f2l_1();
-        assertEquals(0l, t.run(0));
-    }
-    
-    /**
-     * @title  Argument = NaN
-     */
-    public void testB4() {
-        T_f2l_1 t = new T_f2l_1();
-        assertEquals(0l, t.run(Float.NaN));
-    }
-    
-    /**
-     * @title  Argument = POSITIVE_INFINITY
-     */
-    public void testB5() {
-        T_f2l_1 t = new T_f2l_1();
-        assertEquals(Long.MAX_VALUE, t.run(Float.POSITIVE_INFINITY));
-    }
-    
-    /**
-     * @title  Argument = NEGATIVE_INFINITY
-     */
-    public void testB6() {
-        T_f2l_1 t = new T_f2l_1();
-        assertEquals(Long.MIN_VALUE, t.run(Float.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments 
-     */
-    public void testVFE1() {
-        try
-        {
-            Class.forName("dxc.junit.opcodes.f2l.jm.T_f2l_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-    
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double 
-     */
-    public void testVFE2() {
-        try
-        {
-            Class.forName("dxc.junit.opcodes.f2l.jm.T_f2l_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-    
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long 
-     */
-    public void testVFE3() {
-        try
-        {
-            Class.forName("dxc.junit.opcodes.f2l.jm.T_f2l_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-    
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try
-        {
-            Class.forName("dxc.junit.opcodes.f2l.jm.T_f2l_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-    
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference 
-     */
-    public void testVFE5() {
-        try
-        {
-            Class.forName("dxc.junit.opcodes.f2l.jm.T_f2l_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_1.j b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_1.j
deleted file mode 100644
index 0416969..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_1.j
+++ /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 T_f2l_1.java
-.class public dxc/junit/opcodes/f2l/jm/T_f2l_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)J
-    .limit stack 2
-    .limit locals 2
-    fload_1
-    f2l
-    lreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_1.java b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_1.java
deleted file mode 100644
index 1aa20c1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_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 dxc.junit.opcodes.f2l.jm;
-
-public class T_f2l_1 {
-
-    public long run(float a) {
-        return (long)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_2.j b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_2.j
deleted file mode 100644
index df4d9e0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_2.j
+++ /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_f2l_2.java
-.class public dxc/junit/opcodes/f2l/jm/T_f2l_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(F)J
-    .limit stack 2
-    .limit locals 2
-
-;    fload_1
-    f2l
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_2.java b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_2.java
deleted file mode 100644
index 61a830d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_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 dxc.junit.opcodes.f2l.jm;
-
-public class T_f2l_2 {
-
-    public long run(float a) {
-        return (long)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_3.j b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_3.j
deleted file mode 100644
index 72ff8f1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_3.j
+++ /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_f2l_3.java
-.class public dxc/junit/opcodes/f2l/jm/T_f2l_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(D)J
-    .limit stack 2
-    .limit locals 3
-
-    dload_1
-    f2l
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_3.java b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_3.java
deleted file mode 100644
index c755d86..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_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 dxc.junit.opcodes.f2l.jm;
-
-public class T_f2l_3 {
-
-    public long run(double a) {
-        return (long)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_4.j b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_4.j
deleted file mode 100644
index 293a938..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_4.j
+++ /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_f2l_4.java
-.class public dxc/junit/opcodes/f2l/jm/T_f2l_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(J)J
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-;    l2f
-    f2l
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_4.java b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_4.java
deleted file mode 100644
index 1a82262..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_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 dxc.junit.opcodes.f2l.jm;
-
-public class T_f2l_4 {
-
-    public long run(long a) {
-        return (long)(float)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_5.j b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_5.j
deleted file mode 100644
index 534ec84..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_f2l_5.java
-.class public dxc/junit/opcodes/f2l/jm/T_f2l_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(F)J
-    .limit stack 1
-    .limit locals 2
-
-    fload_1
-    f2l
-    
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_5.java b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_5.java
deleted file mode 100644
index ecc44b7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_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 dxc.junit.opcodes.f2l.jm;
-
-public class T_f2l_5 {
-
-    public long run(float a) {
-        return (long)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_6.j b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_6.j
deleted file mode 100644
index 55af8b4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_6.j
+++ /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_f2l_6.java
-.class public dxc/junit/opcodes/f2l/jm/T_f2l_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)J
-    .limit stack 2
-    .limit locals 2
-
-    aload_0
-    f2l
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_6.java b/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_6.java
deleted file mode 100644
index 9984255..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/f2l/jm/T_f2l_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 dxc.junit.opcodes.f2l.jm;
-
-public class T_f2l_6 {
-    
-    public long run(float a) {
-        return (long)a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/Test_fadd.java b/tools/dx-tests/src/dxc/junit/opcodes/fadd/Test_fadd.java
deleted file mode 100644
index a2fef55..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/Test_fadd.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 dxc.junit.opcodes.fadd;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fadd.jm.T_fadd_1;
-
-public class Test_fadd extends DxTestCase {
-
-    /**
-     * @title  Arguments = 2.7f, 3.14f
-     */
-    public void testN1() {
-        T_fadd_1 t = new T_fadd_1();
-        assertEquals(5.84f, t.run(2.7f, 3.14f));
-    }
-
-    /**
-     * @title  Arguments = 0, -3.14f
-     */
-    public void testN2() {
-        T_fadd_1 t = new T_fadd_1();
-        assertEquals(-3.14f, t.run(0, -3.14f));
-    }
-
-    /**
-     * @title Arguments = -3.14f, -2.7f
-     */
-    public void testN3() {
-        T_fadd_1 t = new T_fadd_1();
-        assertEquals(-5.84f, t.run(-3.14f, -2.7f));
-    }
-
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, Float.NaN
-     */
-    public void testB1() {
-        T_fadd_1 t = new T_fadd_1();
-        assertEquals(Float.POSITIVE_INFINITY, t.run(3.3028235E38f, 0.11E38f));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY,
-     * Float.NEGATIVE_INFINITY
-     */
-    public void testB2() {
-        T_fadd_1 t = new T_fadd_1();
-        assertTrue(Float.isNaN(t.run(Float.POSITIVE_INFINITY,
-                Float.NEGATIVE_INFINITY)));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY,
-     * Float.POSITIVE_INFINITY
-     */
-    public void testB3() {
-        T_fadd_1 t = new T_fadd_1();
-        assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
-                Float.POSITIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY, -2.7f
-     */
-    public void testB4() {
-        T_fadd_1 t = new T_fadd_1();
-        assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
-                -2.7f));
-    }
-
-    /**
-     * @title  Arguments = +0, -0f
-     */
-    public void testB5() {
-        T_fadd_1 t = new T_fadd_1();
-        assertEquals(+0f, t.run(+0f, -0f));
-    }
-
-    /**
-     * @title  Arguments = -0f, -0f
-     */
-    public void testB6() {
-        T_fadd_1 t = new T_fadd_1();
-        assertEquals(-0f, t.run(-0f, -0f));
-    }
-
-    /**
-     * @title  Arguments = -2.7f, 2.7f
-     */
-    public void testB7() {
-        T_fadd_1 t = new T_fadd_1();
-        assertEquals(+0f, t.run(-2.7f, 2.7f));
-    }
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, Float.MAX_VALUE
-     */
-    public void testB8() {
-        T_fadd_1 t = new T_fadd_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_fadd_1 t = new T_fadd_1();
-        assertEquals(0f, t.run(Float.MIN_VALUE, -1.4E-45f));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fadd.jm.T_fadd_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fadd.jm.T_fadd_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fadd.jm.T_fadd_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fadd.jm.T_fadd_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_1.j
deleted file mode 100644
index 81aa01f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fadd_1.java
-.class public dxc/junit/opcodes/fadd/jm/T_fadd_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-    fload_1
-    fload_2
-    fadd
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_1.java
deleted file mode 100644
index a093407..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_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 dxc.junit.opcodes.fadd.jm;
-
-public class T_fadd_1 {
-
-    public float run(float a, float b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_2.j
deleted file mode 100644
index 57ee8d7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fadd_2.java
-.class public dxc/junit/opcodes/fadd/jm/T_fadd_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-    fload_1
-    ; fload_2    
-    fadd
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_2.java
deleted file mode 100644
index 6dfb686..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_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 dxc.junit.opcodes.fadd.jm;
-
-public class T_fadd_2 {
-
-    public float run(float a, float b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_3.j
deleted file mode 100644
index dadd9e0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fadd_3.java
-.class public dxc/junit/opcodes/fadd/jm/T_fadd_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FD)F
-    .limit stack 3
-    .limit locals 5
-    fload_1
-    dload_2    
-    fadd
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_3.java
deleted file mode 100644
index 3f26ebd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_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 dxc.junit.opcodes.fadd.jm;
-
-public class T_fadd_3 {
-
-    public float run(float a, double b) {
-        return a+(float)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_4.j
deleted file mode 100644
index 6c6aac1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_4.j
+++ /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_fadd_4.java
-.class public dxc/junit/opcodes/fadd/jm/T_fadd_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JF)F
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-;    l2f
-    fload_3
-    fadd
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_4.java
deleted file mode 100644
index 6224205..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_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 dxc.junit.opcodes.fadd.jm;
-
-public class T_fadd_4 {
-
-    public float run(long a, float b) {
-        return (float)a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_5.j
deleted file mode 100644
index e964fb4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fadd_5.java
-.class public dxc/junit/opcodes/fadd/jm/T_fadd_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-
-    fload_1
-    aload_0
-    fadd
-    freturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_5.java
deleted file mode 100644
index 78855ef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fadd/jm/T_fadd_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 dxc.junit.opcodes.fadd.jm;
-
-public class T_fadd_5 {
-    
-    public float run(float a, float b) {
-        return a+b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/Test_faload.java b/tools/dx-tests/src/dxc/junit/opcodes/faload/Test_faload.java
deleted file mode 100644
index 6a04f7d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/Test_faload.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 dxc.junit.opcodes.faload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.faload.jm.T_faload_1;
-
-public class Test_faload extends DxTestCase {
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN1() {
-        T_faload_1 t = new T_faload_1();
-        float[] arr = new float[2];
-        arr[1] = 3.1415f;
-        assertEquals(3.1415f, t.run(arr, 1));
-    }
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN2() {
-        T_faload_1 t = new T_faload_1();
-        float[] arr = new float[2];
-        arr[0] = 3.1415f;
-        assertEquals(3.1415f, t.run(arr, 0));
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_faload_1 t = new T_faload_1();
-        float[] arr = new float[2];
-        try {
-            t.run(arr, 2);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected NullPointerException
-     */
-    public void testE2() {
-        T_faload_1 t = new T_faload_1();
-        try {
-            t.run(null, 2);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_faload_1 t = new T_faload_1();
-        float[] arr = new float[2];
-        try {
-            t.run(arr, -1);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.faload.jm.T_faload_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.faload.jm.T_faload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.faload.jm.T_faload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.faload.jm.T_faload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - Object, int
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.faload.jm.T_faload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.faload.jm.T_faload_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.faload.jm.T_faload_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.faload.jm.T_faload_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_1.j
deleted file mode 100644
index 448ac41..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_1.j
+++ /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_faload_1.java
-.class public dxc/junit/opcodes/faload/jm/T_faload_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([FI)F
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-
-    faload
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_1.java
deleted file mode 100644
index b8173a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_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 dxc.junit.opcodes.faload.jm;
-
-public class T_faload_1 {
-    public float run(float[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_2.j
deleted file mode 100644
index 0f06fe4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_2.j
+++ /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_faload_2.java
-.class public dxc/junit/opcodes/faload/jm/T_faload_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([FI)F
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-;    iload_2
-
-    faload
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_2.java
deleted file mode 100644
index 4894ed9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_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 dxc.junit.opcodes.faload.jm;
-
-public class T_faload_2 {
-
-    public float run(float[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_3.j
deleted file mode 100644
index 14e2b64..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_faload_3.java
-.class public dxc/junit/opcodes/faload/jm/T_faload_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([FI)F
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    faload
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_3.java
deleted file mode 100644
index 0ca882b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_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 dxc.junit.opcodes.faload.jm;
-
-public class T_faload_3 {
-
-    public float run(float[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_4.j
deleted file mode 100644
index 12c6259..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_4.j
+++ /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_faload_4.java
-.class public dxc/junit/opcodes/faload/jm/T_faload_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([FD)F
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-    faload
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_4.java
deleted file mode 100644
index efff3d7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_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 dxc.junit.opcodes.faload.jm;
-
-public class T_faload_4 {
-
-    public float run(float[] arr, double idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_5.j
deleted file mode 100644
index eb3e0d8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_5.j
+++ /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_faload_5.java
-.class public dxc/junit/opcodes/faload/jm/T_faload_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([FJ)F
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    lload_2
-;    l2i
-    faload
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_5.java
deleted file mode 100644
index d5a8738..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_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 dxc.junit.opcodes.faload.jm;
-
-public class T_faload_5 {
-
-    public float run(float[] arr, long idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_6.j
deleted file mode 100644
index 2592e0d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_6.j
+++ /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_faload_6.java
-.class public dxc/junit/opcodes/faload/jm/T_faload_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;[FI)F
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_3
-
-    faload
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_6.java
deleted file mode 100644
index b70478f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_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 dxc.junit.opcodes.faload.jm;
-
-public class T_faload_6 {
-
-    public float run(Object a, float[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_7.j b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_7.j
deleted file mode 100644
index 6ed18fc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_faload_7.java
-.class public dxc/junit/opcodes/faload/jm/T_faload_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([D[FI)F
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    faload
-
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_7.java b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_7.java
deleted file mode 100644
index 401a9cb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_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 dxc.junit.opcodes.faload.jm;
-
-public class T_faload_7 {
-
-    public float run(double[] a, float[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_8.j b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_8.j
deleted file mode 100644
index 5e94ca0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_8.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_faload_8.java
-.class public dxc/junit/opcodes/faload/jm/T_faload_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([J[FI)F
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    faload
-
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_8.java b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_8.java
deleted file mode 100644
index 4b6d235..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_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 dxc.junit.opcodes.faload.jm;
-
-public class T_faload_8 {
-
-    public float run(long[] a, float[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_9.j b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_9.j
deleted file mode 100644
index 3a8e65c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_9.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_faload_9.java
-.class public dxc/junit/opcodes/faload/jm/T_faload_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([FI)F
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    aload_0
-    faload
-    freturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_9.java b/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_9.java
deleted file mode 100644
index a53e367..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/faload/jm/T_faload_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 dxc.junit.opcodes.faload.jm;
-
-public class T_faload_9 {
-    
-    public float run(float[] arr, int idx) {
-        return arr[idx];
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/Test_fastore.java b/tools/dx-tests/src/dxc/junit/opcodes/fastore/Test_fastore.java
deleted file mode 100644
index bf2a6c9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/Test_fastore.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 dxc.junit.opcodes.fastore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fastore.jm.T_fastore_1;
-
-public class Test_fastore extends DxTestCase {
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN1() {
-        T_fastore_1 t = new T_fastore_1();
-        float[] arr = new float[2];
-        t.run(arr, 1, 2.7f);
-        assertEquals(2.7f, arr[1]);
-    }
-
-    /**
-     * @title normal test. Trying different indexes
-     */
-    public void testN2() {
-        T_fastore_1 t = new T_fastore_1();
-        float[] arr = new float[2];
-        t.run(arr, 0, 2.7f);
-        assertEquals(2.7f, arr[0]);
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_fastore_1 t = new T_fastore_1();
-        float[] arr = new float[2];
-        try {
-            t.run(arr, 2, 2.7f);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected NullPointerException
-     */
-    public void testE2() {
-        T_fastore_1 t = new T_fastore_1();
-        try {
-            t.run(null, 2, 2.7f);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_fastore_1 t = new T_fastore_1();
-        float[] arr = new float[2];
-        try {
-            t.run(arr, -1, 2.7f);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fastore.jm.T_fastore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fastore.jm.T_fastore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double,
-     * float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fastore.jm.T_fastore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, int, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fastore.jm.T_fastore_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - object, int,
-     * float
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.fastore.jm.T_fastore_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], int,
-     * float
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.fastore.jm.T_fastore_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int,
-     * float
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.fastore.jm.T_fastore_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference,
-     * float
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.fastore.jm.T_fastore_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_1.j
deleted file mode 100644
index 82dc298..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_1.j
+++ /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_fastore_1.java
-.class public dxc/junit/opcodes/fastore/jm/T_fastore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([FIF)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    fload_3
-    fastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_1.java
deleted file mode 100644
index 9977fce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_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 dxc.junit.opcodes.fastore.jm;
-
-public class T_fastore_1 {
-    public void run(float[] arr, int idx, float value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_2.j
deleted file mode 100644
index 09d9ee1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_2.j
+++ /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_fastore_2.java
-.class public dxc/junit/opcodes/fastore/jm/T_fastore_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([FIF)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    ;fload_3
-    fastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_2.java
deleted file mode 100644
index d9e9013..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_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 dxc.junit.opcodes.fastore.jm;
-
-public class T_fastore_2 {
-
-    public void run(float[] arr, int idx, float value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_3.j
deleted file mode 100644
index 861cc0f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_3.j
+++ /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_fastore_3.java
-.class public dxc/junit/opcodes/fastore/jm/T_fastore_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([FIF)V
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    fload_3
-    fastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_3.java
deleted file mode 100644
index 7d55003..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_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 dxc.junit.opcodes.fastore.jm;
-
-public class T_fastore_3 {
-
-    public void run(float[] arr, int idx, float value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_4.j
deleted file mode 100644
index 12318b4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_4.j
+++ /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_fastore_4.java
-.class public dxc/junit/opcodes/fastore/jm/T_fastore_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([FDF)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-;    d2i
-    fload 4
-
-    fastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_4.java
deleted file mode 100644
index 6d3b631..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_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 dxc.junit.opcodes.fastore.jm;
-
-public class T_fastore_4 {
-
-    public void run(float[] arr, double idx, float value) {
-        arr[(int)idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_5.j
deleted file mode 100644
index 4c2325d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_5.j
+++ /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_fastore_5.java
-.class public dxc/junit/opcodes/fastore/jm/T_fastore_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([FIJ)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    iload_2
-    lload_3
-;    l2f
-    fastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_5.java
deleted file mode 100644
index 34e158a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_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 dxc.junit.opcodes.fastore.jm;
-
-public class T_fastore_5 {
-
-    public void run(float[] arr, int idx, float value) {
-        arr[idx] = (float)value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_6.j b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_6.j
deleted file mode 100644
index b1cabb8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_6.j
+++ /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_fastore_6.java
-.class public dxc/junit/opcodes/fastore/jm/T_fastore_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;IF)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    fload_3
-    fastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_6.java b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_6.java
deleted file mode 100644
index 39d8539..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_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 dxc.junit.opcodes.fastore.jm;
-
-public class T_fastore_6 {
-
-    public void run(Object a, float[] arr, int idx, float value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_7.j b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_7.j
deleted file mode 100644
index 3bf14f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_7.j
+++ /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_fastore_7.java
-.class public dxc/junit/opcodes/fastore/jm/T_fastore_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([D[FIF)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_3
-    fload 4
-    fastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_7.java b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_7.java
deleted file mode 100644
index 8766fd1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_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 dxc.junit.opcodes.fastore.jm;
-
-public class T_fastore_7 {
-
-    public void run(double a[], float[] arr, int idx, float value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_8.j b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_8.j
deleted file mode 100644
index 138ccc1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_8.j
+++ /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_fastore_8.java
-.class public dxc/junit/opcodes/fastore/jm/T_fastore_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([J[FIF)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_3
-    fload 4
-    fastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_8.java b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_8.java
deleted file mode 100644
index 38264cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_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 dxc.junit.opcodes.fastore.jm;
-
-public class T_fastore_8 {
-
-    public void run(long a[], float[] arr, int idx, float value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_9.j b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_9.j
deleted file mode 100644
index 66e8723..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fastore_9.java
-.class public dxc/junit/opcodes/fastore/jm/T_fastore_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([FIF)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    aload_0
-    fload_3
-    fastore
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_9.java b/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_9.java
deleted file mode 100644
index af77ce5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fastore/jm/T_fastore_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 dxc.junit.opcodes.fastore.jm;
-
-public class T_fastore_9 {
-    
-    public void run(float[] arr, int idx, float value) {
-        arr[idx] = value;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/Test_fcmpg.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/Test_fcmpg.java
deleted file mode 100644
index 5af23b3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/Test_fcmpg.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fcmpg;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fcmpg.jm.T_fcmpg_1;
-
-public class Test_fcmpg extends DxTestCase {
-
-    /**
-     * @title  Arguments = 3.14f, 2.7f
-     */
-    public void testN1() {
-        T_fcmpg_1 t = new T_fcmpg_1();
-        assertEquals(1, t.run(3.14f, 2.7f));
-    }
-
-    /**
-     * @title  Arguments = -3.14f, 2.7f
-     */
-    public void testN2() {
-        T_fcmpg_1 t = new T_fcmpg_1();
-        assertEquals(-1, t.run(-3.14f, 2.7f));
-    }
-
-    /**
-     * @title  Arguments = 3.14, 3.14
-     */
-    public void testN3() {
-        T_fcmpg_1 t = new T_fcmpg_1();
-        assertEquals(0, t.run(3.14f, 3.14f));
-    }
-
-    /**
-     * @title  Arguments = Float.NaN, Float.MAX_VALUE
-     */
-    public void testB1() {
-        T_fcmpg_1 t = new T_fcmpg_1();
-        assertEquals(1, t.run(Float.NaN, Float.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = +0, -0
-     */
-    public void testB2() {
-        T_fcmpg_1 t = new T_fcmpg_1();
-        assertEquals(0, t.run(+0f, -0f));
-    }
-
-    /**
-     * @title  Arguments = Float.NEGATIVE_INFINITY, Float.MIN_VALUE
-     */
-    public void testB3() {
-        T_fcmpg_1 t = new T_fcmpg_1();
-        assertEquals(-1, t.run(Float.NEGATIVE_INFINITY, Float.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY, Float.MAX_VALUE
-     */
-    public void testB4() {
-        T_fcmpg_1 t = new T_fcmpg_1();
-        assertEquals(1, t.run(Float.POSITIVE_INFINITY, Float.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY,
-     * Float.NEGATIVE_INFINITY
-     */
-    public void testB5() {
-        T_fcmpg_1 t = new T_fcmpg_1();
-        assertEquals(1, t.run(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fcmpg.jm.T_fcmpg_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fcmpg.jm.T_fcmpg_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fcmpg.jm.T_fcmpg_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fcmpg.jm.T_fcmpg_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_1.j
deleted file mode 100644
index 557db8b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_1.j
+++ /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_fcmpg_1.java
-.class public dxc/junit/opcodes/fcmpg/jm/T_fcmpg_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)I
-    .limit stack 2
-    .limit locals 3
-    
-    fload_1
-    fload_2
-    
-    fcmpg 
-    dup
-    ifeq Label0
-    ifgt Label1
-    
-    iconst_m1
-    ireturn
-    
-    Label0:
-    iconst_0
-    ireturn
-
-    Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_1.java
deleted file mode 100644
index 90916a4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_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 dxc.junit.opcodes.fcmpg.jm;
-
-public class T_fcmpg_1 {
-
-    public int run(float a, float b) {
-        if(a > b)
-            return 1;
-        if(a == b)
-            return 0;
-        return -1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_2.j
deleted file mode 100644
index 98a5a14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_2.j
+++ /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_fcmpg_2.java
-.class public dxc/junit/opcodes/fcmpg/jm/T_fcmpg_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FF)Z
-    .limit stack 2
-    .limit locals 3
-
-    fload_1
-;    fload_2
-    fcmpg
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_2.java
deleted file mode 100644
index 76fc02e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_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 dxc.junit.opcodes.fcmpg.jm;
-
-public class T_fcmpg_2 {
-
-    public boolean run(float a, float b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_3.j
deleted file mode 100644
index 8404b13..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_3.j
+++ /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_fcmpg_3.java
-.class public dxc/junit/opcodes/fcmpg/jm/T_fcmpg_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(FF)Z
-    .limit stack 4
-    .limit locals 3
-
-    fload_1
-    dconst_1
-    fcmpg 
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_3.java
deleted file mode 100644
index f559c7e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_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 dxc.junit.opcodes.fcmpg.jm;
-
-public class T_fcmpg_3 {
-
-    public boolean run(float a, float b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_4.j
deleted file mode 100644
index f6ed938..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_4.j
+++ /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_fcmpg_4.java
-.class public dxc/junit/opcodes/fcmpg/jm/T_fcmpg_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(FF)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-    fload_1
-
-    fcmpg 
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_4.java
deleted file mode 100644
index b540532..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_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 dxc.junit.opcodes.fcmpg.jm;
-
-public class T_fcmpg_4 {
-
-    public boolean run(float a, float b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_5.j
deleted file mode 100644
index cb0a344..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_5.j
+++ /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_fcmpg_5.java
-.class public dxc/junit/opcodes/fcmpg/jm/T_fcmpg_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    fload_2
-    fcmpl
-    ifle Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_5.java
deleted file mode 100644
index 75872f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpg/jm/T_fcmpg_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 dxc.junit.opcodes.fcmpg.jm;
-
-public class T_fcmpg_5 {
-    
-    public boolean run(float a, float b) {
-        return a > b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/Test_fcmpl.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/Test_fcmpl.java
deleted file mode 100644
index 78c0b03..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/Test_fcmpl.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 dxc.junit.opcodes.fcmpl;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fcmpl.jm.T_fcmpl_1;
-
-public class Test_fcmpl extends DxTestCase {
-
-    /**
-     * @title  Arguments = 3.14f, 2.7f
-     */
-    public void testN1() {
-        T_fcmpl_1 t = new T_fcmpl_1();
-        assertEquals(1, t.run(3.14f, 2.7f));
-    }
-
-    /**
-     * @title  Arguments = -3.14f, 2.7f
-     */
-    public void testN2() {
-        T_fcmpl_1 t = new T_fcmpl_1();
-        assertEquals(-1, t.run(-3.14f, 2.7f));
-    }
-
-    /**
-     * @title  Arguments = 3.14, 3.14
-     */
-    public void testN3() {
-        T_fcmpl_1 t = new T_fcmpl_1();
-        assertEquals(0, t.run(3.14f, 3.14f));
-    }
-
-    /**
-     * @title  Arguments = Float.NaN, Float.MAX_VALUE
-     */
-    public void testB1() {
-        T_fcmpl_1 t = new T_fcmpl_1();
-        assertEquals(-1, t.run(Float.NaN, Float.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = +0, -0
-     */
-    public void testB2() {
-        T_fcmpl_1 t = new T_fcmpl_1();
-        assertEquals(0, t.run(+0f, -0f));
-    }
-
-    /**
-     * @title  Arguments = Float.NEGATIVE_INFINITY, Float.MIN_VALUE
-     */
-    public void testB3() {
-        T_fcmpl_1 t = new T_fcmpl_1();
-        assertEquals(-1, t.run(Float.NEGATIVE_INFINITY, Float.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY, Float.MAX_VALUE
-     */
-    public void testB4() {
-        T_fcmpl_1 t = new T_fcmpl_1();
-        assertEquals(1, t.run(Float.POSITIVE_INFINITY, Float.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY,
-     * Float.NEGATIVE_INFINITY
-     */
-    public void testB5() {
-        T_fcmpl_1 t = new T_fcmpl_1();
-        assertEquals(1, t.run(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fcmpl.jm.T_fcmpl_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fcmpl.jm.T_fcmpl_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fcmpl.jm.T_fcmpl_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fcmpl.jm.T_fcmpl_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_1.j
deleted file mode 100644
index 3bf5533..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_1.j
+++ /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_fcmpl_1.java
-.class public dxc/junit/opcodes/fcmpl/jm/T_fcmpl_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)I
-    .limit stack 2
-    .limit locals 3
-    
-    fload_1
-    fload_2
-    
-    fcmpl 
-    dup
-    ifeq Label0
-    ifgt Label1
-    
-    iconst_m1
-    ireturn
-    
-    Label0:
-    iconst_0
-    ireturn
-
-    Label1:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_1.java
deleted file mode 100644
index 2dd1c26..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_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 dxc.junit.opcodes.fcmpl.jm;
-
-public class T_fcmpl_1 {
-
-    public int run(float a, float b) {
-        if(a > b)
-            return 1;
-        if(a == b)
-            return 0;
-        return -1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_2.j
deleted file mode 100644
index 01d6c1a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_2.j
+++ /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_fcmpl_2.java
-.class public dxc/junit/opcodes/fcmpl/jm/T_fcmpl_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FF)Z
-    .limit stack 2
-    .limit locals 3
-
-    fload_1
-;    fload_2
-    fcmpl
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_2.java
deleted file mode 100644
index 12cb22f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_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 dxc.junit.opcodes.fcmpl.jm;
-
-public class T_fcmpl_2 {
-
-    public boolean run(float a, float b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_3.j
deleted file mode 100644
index f944312..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_3.j
+++ /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_fcmpl_3.java
-.class public dxc/junit/opcodes/fcmpl/jm/T_fcmpl_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(FF)Z
-    .limit stack 4
-    .limit locals 3
-
-    fload_1
-    dconst_1
-    fcmpl 
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_3.java
deleted file mode 100644
index 984516a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_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 dxc.junit.opcodes.fcmpl.jm;
-
-public class T_fcmpl_3 {
-
-    public boolean run(float a, float b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_4.j
deleted file mode 100644
index 42a0161..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_4.j
+++ /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_fcmpl_4.java
-.class public dxc/junit/opcodes/fcmpl/jm/T_fcmpl_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(FF)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-    fload_1
-
-    fcmpl 
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_4.java
deleted file mode 100644
index ca79301..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_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 dxc.junit.opcodes.fcmpl.jm;
-
-public class T_fcmpl_4 {
-
-    public boolean run(float a, float b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_5.j
deleted file mode 100644
index 65742db..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_5.j
+++ /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_fcmpl_5.java
-.class public dxc/junit/opcodes/fcmpl/jm/T_fcmpl_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    fload_2
-    fcmpl
-    ifle Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_5.java
deleted file mode 100644
index 0a661b1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fcmpl/jm/T_fcmpl_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 dxc.junit.opcodes.fcmpl.jm;
-
-public class T_fcmpl_5 {
-    
-    public boolean run(float a, float b) {
-        return a > b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/Test_fconst_0.java b/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/Test_fconst_0.java
deleted file mode 100644
index cf2b492..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/Test_fconst_0.java
+++ /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.
- */
-
-package dxc.junit.opcodes.fconst_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fconst_0.jm.T_fconst_0_1;
-
-public class Test_fconst_0 extends DxTestCase {
-
-    /**
-     * @title normal test 
-     */
-    public void testN1() {
-        T_fconst_0_1 t = new T_fconst_0_1();
-        float b = 1234f;
-        float c = 1234f;
-        float d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fconst_0.jm.T_fconst_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_1.j
deleted file mode 100644
index f96b078..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_1.j
+++ /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_fconst_0_1.java
-.class public dxc/junit/opcodes/fconst_0/jm/T_fconst_0_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()F
-    fconst_0
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_1.java
deleted file mode 100644
index 976773d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_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 dxc.junit.opcodes.fconst_0.jm;
-
-public class T_fconst_0_1 {
-
-    public float run() {
-        return 0f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_2.j
deleted file mode 100644
index 864b359..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_2.j
+++ /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_fconst_0_2.java
-.class public dxc/junit/opcodes/fconst_0/jm/T_fconst_0_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()F
-    .limit stack 1
-;    .limit locals 1
-
-    fconst_0
-    fconst_0
-
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_2.java
deleted file mode 100644
index 0f7267b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_0/jm/T_fconst_0_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 dxc.junit.opcodes.fconst_0.jm;
-
-public class T_fconst_0_2 {
-
-    public float run() {
-        return 0f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/Test_fconst_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/Test_fconst_1.java
deleted file mode 100644
index 25ae549..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/Test_fconst_1.java
+++ /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.
- */
-
-package dxc.junit.opcodes.fconst_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fconst_1.jm.T_fconst_1_1;
-
-public class Test_fconst_1 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_fconst_1_1 t = new T_fconst_1_1();
-        float b = 1235f;
-        float c = 1234f;
-        float d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fconst_1.jm.T_fconst_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_1.j
deleted file mode 100644
index af3a723..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_1.j
+++ /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_fconst_1_1.java
-.class public dxc/junit/opcodes/fconst_1/jm/T_fconst_1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()F
-    fconst_1
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_1.java
deleted file mode 100644
index b9751a4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_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 dxc.junit.opcodes.fconst_1.jm;
-
-public class T_fconst_1_1 {
-
-    public float run() {
-        return 1f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_2.j
deleted file mode 100644
index 98c41d4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_2.j
+++ /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_fconst_1_2.java
-.class public dxc/junit/opcodes/fconst_1/jm/T_fconst_1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()F
-    .limit stack 1
-;    .limit locals 1
-
-    fconst_1
-    fconst_1
-
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_2.java
deleted file mode 100644
index 6fa39d1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_1/jm/T_fconst_1_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 dxc.junit.opcodes.fconst_1.jm;
-
-public class T_fconst_1_2 {
-
-    public float run() {
-        return 1f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/Test_fconst_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/Test_fconst_2.java
deleted file mode 100644
index 4aeaf8b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/Test_fconst_2.java
+++ /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.
- */
-
-package dxc.junit.opcodes.fconst_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fconst_2.jm.T_fconst_2_1;
-
-public class Test_fconst_2 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_fconst_2_1 t = new T_fconst_2_1();
-        float b = 1236f;
-        float c = 1234f;
-        float d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fconst_2.jm.T_fconst_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_1.j
deleted file mode 100644
index 2c7ef7f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_1.j
+++ /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_fconst_2_1.java
-.class public dxc/junit/opcodes/fconst_2/jm/T_fconst_2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()F
-    fconst_2
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_1.java
deleted file mode 100644
index 7ac0339..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_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 dxc.junit.opcodes.fconst_2.jm;
-
-public class T_fconst_2_1 {
-
-    public float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_2.j
deleted file mode 100644
index 795fb7e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_2.j
+++ /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_fconst_2_2.java
-.class public dxc/junit/opcodes/fconst_2/jm/T_fconst_2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()F
-    .limit stack 1
-;    .limit locals 1
-
-    fconst_2
-    fconst_2
-
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_2.java
deleted file mode 100644
index f910831..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fconst_2/jm/T_fconst_2_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 dxc.junit.opcodes.fconst_2.jm;
-
-public class T_fconst_2_2 {
-
-    public float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/Test_fdiv.java b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/Test_fdiv.java
deleted file mode 100644
index ce1f3d3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/Test_fdiv.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fdiv;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fdiv.jm.T_fdiv_1;
-
-public class Test_fdiv extends DxTestCase {
-
-    /**
-     * @title Arguments = 2.7f, 3.14f
-     */
-    public void testN1() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(0.8598726f, t.run(2.7f, 3.14f));
-    }
-
-    /**
-     * @title  Dividend = 0
-     */
-    public void testN2() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(0f, t.run(0, 3.14f));
-    }
-
-    /**
-     * @title  Dividend is negative
-     */
-    public void testN3() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(-1.162963f, t.run(-3.14f, 2.7f));
-    }
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, Float.NaN
-     */
-    public void testB1() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY,
-     * Float.NEGATIVE_INFINITY
-     */
-    public void testB2() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY,
-                Float.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY, -2.7f
-     */
-    public void testB3() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
-                -2.7f));
-    }
-
-    /**
-     * @title  Arguments = -2.7f, Float.NEGATIVE_INFINITY
-     */
-    public void testB4() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(0f, t.run(-2.7f, Float.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = 0, 0
-     */
-    public void testB5() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(Float.NaN, t.run(0, 0));
-    }
-
-    /**
-     * @title  Arguments = 0, -2.7
-     */
-    public void testB6() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(-0f, t.run(0, -2.7f));
-    }
-
-    /**
-     * @title  Arguments = -2.7, 0
-     */
-    public void testB7() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(Float.NEGATIVE_INFINITY, t.run(-2.7f, 0));
-    }
-
-    /**
-     * @title  Arguments = 1, Float.MAX_VALUE
-     */
-    public void testB8() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(Float.POSITIVE_INFINITY, t.run(1, Float.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, -1E-9f
-     */
-    public void testB9() {
-        T_fdiv_1 t = new T_fdiv_1();
-        assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.MAX_VALUE, -1E-9f));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fdiv.jm.T_fdiv_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float / double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fdiv.jm.T_fdiv_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fdiv.jm.T_fdiv_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference / float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fdiv.jm.T_fdiv_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_1.j
deleted file mode 100644
index a64d47f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fdiv_1.java
-.class public dxc/junit/opcodes/fdiv/jm/T_fdiv_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-    fload_1
-    fload_2
-    fdiv
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_1.java
deleted file mode 100644
index 4d6c2e3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_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 dxc.junit.opcodes.fdiv.jm;
-
-public class T_fdiv_1 {
-
-    public float run(float a, float b) {
-        return a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_2.j
deleted file mode 100644
index 6755eaf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fdiv_2.java
-.class public dxc/junit/opcodes/fdiv/jm/T_fdiv_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-    fload_1
-    ; fload_2    
-    fdiv
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_2.java
deleted file mode 100644
index 447fe13..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_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 dxc.junit.opcodes.fdiv.jm;
-
-public class T_fdiv_2 {
-
-    public float run(float a, float b) {
-        return a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_3.j
deleted file mode 100644
index 06872a1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fdiv_3.java
-.class public dxc/junit/opcodes/fdiv/jm/T_fdiv_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FD)F
-    .limit stack 3
-    .limit locals 5
-    fload_1
-    dload_2    
-    fdiv
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_3.java
deleted file mode 100644
index 24d8a09..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_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 dxc.junit.opcodes.fdiv.jm;
-
-public class T_fdiv_3 {
-
-    public float run(float a, double b) {
-        return a/(float)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_4.j
deleted file mode 100644
index a8e98ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_4.j
+++ /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_fdiv_4.java
-.class public dxc/junit/opcodes/fdiv/jm/T_fdiv_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JF)F
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-;    l2f
-    fload_3
-    fdiv
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_4.java
deleted file mode 100644
index 0c2cc97..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_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 dxc.junit.opcodes.fdiv.jm;
-
-public class T_fdiv_4 {
-
-    public float run(long a, float b) {
-        return (float)a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_5.j
deleted file mode 100644
index c273a5e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fdiv_5.java
-.class public dxc/junit/opcodes/fdiv/jm/T_fdiv_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    fload_2
-    fdiv
-    freturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_5.java
deleted file mode 100644
index f93de7b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fdiv/jm/T_fdiv_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 dxc.junit.opcodes.fdiv.jm;
-
-public class T_fdiv_5 {
-    
-    public float run(float a, float b) {
-        return a/b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/Test_fload.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/Test_fload.java
deleted file mode 100644
index 736ebbb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/Test_fload.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 dxc.junit.opcodes.fload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fload.jm.T_fload_1;
-import dxc.junit.opcodes.fload.jm.T_fload_1_w;
-import dxc.junit.opcodes.fload.jm.T_fload_2;
-import dxc.junit.opcodes.fload.jm.T_fload_2_w;
-
-public class Test_fload extends DxTestCase {
-
-    /*
-     * NORMAL fload VERSION
-     */
-
-    /**
-     * @title  Test fload 1
-     */
-    public void testN1() {
-        T_fload_1 t = new T_fload_1();
-        assertEquals(2f, t.run());
-    }
-
-    /**
-     * @title  Test fload 255
-     */
-    public void testN2() {
-        T_fload_2 t = new T_fload_2();
-        assertEquals(2f, t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.21
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload.jm.T_fload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload.jm.T_fload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload.jm.T_fload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload.jm.T_fload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE fload VERSION
-     */
-
-    /**
-     * @title  Test fload 257
-     */
-    public void testN3() {
-        T_fload_1_w t = new T_fload_1_w();
-        assertEquals(2f, t.run());
-    }
-
-    /**
-     * @title  Test fload_w 1
-     */
-    public void testN4() {
-        T_fload_2_w t = new T_fload_2_w();
-        assertEquals(2f, t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload.jm.T_fload_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload.jm.T_fload_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload.jm.T_fload_5_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload.jm.T_fload_6_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1.j
deleted file mode 100644
index d48d674..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1.j
+++ /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_fload_1.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()F
-    .limit stack 2
-    .limit locals 6
-    
-    fconst_2
-    fstore 4
-    fconst_1
-    fload 4
-    
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1.java
deleted file mode 100644
index 0659eb4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_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 dxc.junit.opcodes.fload.jm;
-
-public class T_fload_1 {
-
-    public float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1_w.j
deleted file mode 100644
index 5c3e03e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1_w.j
+++ /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_fload_1_w.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_1_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()F
-    .limit stack 2
-    .limit locals 300
-    
-    fconst_2
-    fstore 257
-    fconst_1
-    fload 257
-    
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1_w.java
deleted file mode 100644
index 0a75402..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_1_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fload.jm;
-
-public class T_fload_1_w {
-
-    public float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2.j
deleted file mode 100644
index affbbcc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2.j
+++ /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_fload_2.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()F
-    .limit stack 2
-    .limit locals 300
-    
-    fconst_2
-    fstore 255
-    fconst_1
-    fload 255
-    
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2.java
deleted file mode 100644
index 5f955cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_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 dxc.junit.opcodes.fload.jm;
-
-public class T_fload_2 {
-
-      public float run() {
-          return 2f;
-      }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2_w.j
deleted file mode 100644
index 8cfd4b9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2_w.j
+++ /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_fload_2_w.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_2_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()F
-    .limit stack 2
-    .limit locals 2
-    
-    fconst_2
-    fstore 1
-    fconst_1
-    fload_w 1
-    
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2_w.java
deleted file mode 100644
index 06e678d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_2_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fload.jm;
-
-public class T_fload_2_w {
-
-      public float run() {
-          return 2f;
-      }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3.j
deleted file mode 100644
index b46e1ae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fload_3.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    fload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3.java
deleted file mode 100644
index 4a96c8d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3.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 dxc.junit.opcodes.fload.jm;
-
-public class T_fload_3 {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3_w.j
deleted file mode 100644
index ca096aa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fload_3_w.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_3_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 300
-
-    fload 300
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3_w.java
deleted file mode 100644
index e097e18..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_3_w.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 dxc.junit.opcodes.fload.jm;
-
-public class T_fload_3_w {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4.j
deleted file mode 100644
index 0fb25c9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4.j
+++ /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_fload_4.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_0
-    
-    fload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4.java
deleted file mode 100644
index 07f75b5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_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 dxc.junit.opcodes.fload.jm;
-
-public class T_fload_4 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4_w.j
deleted file mode 100644
index d58ae6a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4_w.j
+++ /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_fload_4_w.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_4_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 300
-
-    dconst_1
-    dstore 260
-    
-    fload_w 260
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4_w.java
deleted file mode 100644
index 8ae2258..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_4_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fload.jm;
-
-public class T_fload_4_w {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5.j
deleted file mode 100644
index 94dc078..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5.j
+++ /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_fload_5.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_0
-    
-    fload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5.java
deleted file mode 100644
index 7f7dc3c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_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 dxc.junit.opcodes.fload.jm;
-
-public class T_fload_5 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5_w.j
deleted file mode 100644
index dbffaa5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5_w.j
+++ /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_fload_5_w.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_5_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 300
-
-    lconst_1
-    lstore 260
-    
-    fload_w 260
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5_w.java
deleted file mode 100644
index 0cabc57..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_5_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fload.jm;
-
-public class T_fload_5_w {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6.j
deleted file mode 100644
index b4c0270..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6.j
+++ /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_fload_6.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    fconst_1
-    fstore_0
-    
-    fload 0
-    fload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6.java
deleted file mode 100644
index 8ce1234..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_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 dxc.junit.opcodes.fload.jm;
-
-public class T_fload_6 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6_w.j
deleted file mode 100644
index 32e9795..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6_w.j
+++ /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_fload_6_w.java
-.class public dxc/junit/opcodes/fload/jm/T_fload_6_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 300
-
-    fconst_1
-    fstore 260
-    
-    fload_w 260
-    fload_w 260
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6_w.java
deleted file mode 100644
index 5f61753..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload/jm/T_fload_6_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fload.jm;
-
-public class T_fload_6_w {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/Test_fload_0.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/Test_fload_0.java
deleted file mode 100644
index b796eb7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/Test_fload_0.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fload_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fload_0.jm.T_fload_0_1;
-import dxc.junit.opcodes.fload_0.jm.T_fload_0_6;
-
-public class Test_fload_0 extends DxTestCase {
-
-    /**
-     * @title  value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(2f, T_fload_0_1.run());
-    }
-
-    /**
-     * @title equality of fload_<n> and fload <n>
-     */
-    public void testN2() {
-        assertTrue(T_fload_0_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_0.jm.T_fload_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_0.jm.T_fload_0_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_0.jm.T_fload_0_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_0.jm.T_fload_0_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_1.j
deleted file mode 100644
index c7b69ed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fload_0_1.java
-.class public dxc/junit/opcodes/fload_0/jm/T_fload_0_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 1
-    
-    fconst_2
-    fstore_0
-    fconst_1
-    fload_0
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_1.java
deleted file mode 100644
index a577960..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_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 dxc.junit.opcodes.fload_0.jm;
-
-public class T_fload_0_1 {
-
-    public static float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_2.j
deleted file mode 100644
index 6a795e3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fload_0_2.java
-.class public dxc/junit/opcodes/fload_0/jm/T_fload_0_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    fload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_2.java
deleted file mode 100644
index 482b227..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_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 dxc.junit.opcodes.fload_0.jm;
-
-public class T_fload_0_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_3.j
deleted file mode 100644
index 4b378f5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_3.j
+++ /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_fload_0_3.java
-.class public dxc/junit/opcodes/fload_0/jm/T_fload_0_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_0
-    
-    fload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_3.java
deleted file mode 100644
index 31db2e6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_3.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 dxc.junit.opcodes.fload_0.jm;
-
-public class T_fload_0_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_4.j
deleted file mode 100644
index 23f2597..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_4.j
+++ /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_fload_0_4.java
-.class public dxc/junit/opcodes/fload_0/jm/T_fload_0_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_0
-    
-    fload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_4.java
deleted file mode 100644
index c812def..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_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 dxc.junit.opcodes.fload_0.jm;
-
-public class T_fload_0_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_5.j
deleted file mode 100644
index f767cfd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_5.j
+++ /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_fload_0_5.java
-.class public dxc/junit/opcodes/fload_0/jm/T_fload_0_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    fconst_1
-    fstore_0
-    
-    fload_0
-    fload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_5.java
deleted file mode 100644
index 98ebafd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_5.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 dxc.junit.opcodes.fload_0.jm;
-
-public class T_fload_0_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_6.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_6.j
deleted file mode 100644
index dd42b7e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_6.j
+++ /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_fload_0_6.java
-.class public dxc/junit/opcodes/fload_0/jm/T_fload_0_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 1
-
-    fconst_2
-    fstore_0
-
-    fload_0
-    fload 0
-    fcmpl 
-    
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_6.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_6.java
deleted file mode 100644
index 1a337b0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_0/jm/T_fload_0_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 dxc.junit.opcodes.fload_0.jm;
-
-public class T_fload_0_6 {
-
-    public static boolean run() {
-        float i = 2f;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/Test_fload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/Test_fload_1.java
deleted file mode 100644
index 91a6112..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/Test_fload_1.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fload_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fload_1.jm.T_fload_1_1;
-import dxc.junit.opcodes.fload_1.jm.T_fload_1_6;
-
-public class Test_fload_1 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(2f, T_fload_1_1.run());
-    }
-
-    /**
-     * @title equality of fload_<n> and fload <n>
-     */
-    public void testN2() {
-        assertTrue(T_fload_1_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title (index must be no greater than the value
-     * of max_locals-1).
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_1.jm.T_fload_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_1.jm.T_fload_1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_1.jm.T_fload_1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_1.jm.T_fload_1_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_1.j
deleted file mode 100644
index 93f205e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fload_1_1.java
-.class public dxc/junit/opcodes/fload_1/jm/T_fload_1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 2
-    
-    fconst_2
-    fstore_1
-    fconst_1
-    fload_1
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_1.java
deleted file mode 100644
index 7e2f5c4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_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 dxc.junit.opcodes.fload_1.jm;
-
-public class T_fload_1_1 {
-
-    public static float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_2.j
deleted file mode 100644
index fabb478..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fload_1_2.java
-.class public dxc/junit/opcodes/fload_1/jm/T_fload_1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 1
-
-    fload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_2.java
deleted file mode 100644
index 6e54dd8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_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 dxc.junit.opcodes.fload_1.jm;
-
-public class T_fload_1_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_3.j
deleted file mode 100644
index f28c5bf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_3.j
+++ /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_fload_1_3.java
-.class public dxc/junit/opcodes/fload_1/jm/T_fload_1_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_1
-    
-    fload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_3.java
deleted file mode 100644
index 10e5e25..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_3.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 dxc.junit.opcodes.fload_1.jm;
-
-public class T_fload_1_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_4.j
deleted file mode 100644
index f0154b9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_4.j
+++ /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_fload_1_4.java
-.class public dxc/junit/opcodes/fload_1/jm/T_fload_1_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_1
-    
-    fload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_4.java
deleted file mode 100644
index cd6f66a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_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 dxc.junit.opcodes.fload_1.jm;
-
-public class T_fload_1_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_5.j
deleted file mode 100644
index 6778df6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_5.j
+++ /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_fload_1_5.java
-.class public dxc/junit/opcodes/fload_1/jm/T_fload_1_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    fconst_1
-    fstore_1
-    
-    fload_1
-    fload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_5.java
deleted file mode 100644
index ba47f43..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_5.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 dxc.junit.opcodes.fload_1.jm;
-
-public class T_fload_1_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_6.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_6.j
deleted file mode 100644
index 8557f82..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_6.j
+++ /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_fload_1_6.java
-.class public dxc/junit/opcodes/fload_1/jm/T_fload_1_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 2
-
-    fconst_2
-    fstore_1
-
-    fload_1
-    fload 1
-    fcmpl 
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_6.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_6.java
deleted file mode 100644
index 31d567b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_1/jm/T_fload_1_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 dxc.junit.opcodes.fload_1.jm;
-
-public class T_fload_1_6 {
-
-    public static boolean run() {
-        float i = 2f;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/Test_fload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/Test_fload_2.java
deleted file mode 100644
index 7a5bb47..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/Test_fload_2.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fload_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fload_2.jm.T_fload_2_1;
-import dxc.junit.opcodes.fload_2.jm.T_fload_2_6;
-
-public class Test_fload_2 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(2f, T_fload_2_1.run());
-    }
-
-    /**
-     * @title equality of fload_<n> and fload <n>
-     */
-    public void testN2() {
-        assertTrue(T_fload_2_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title (index must be no greater than the value
-     * of max_locals-1).
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_2.jm.T_fload_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_2.jm.T_fload_2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_2.jm.T_fload_2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_2.jm.T_fload_2_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_1.j
deleted file mode 100644
index e6fcb75..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fload_2_1.java
-.class public dxc/junit/opcodes/fload_2/jm/T_fload_2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 3
-    
-    fconst_2
-    fstore_2
-    fconst_1
-    fload_2
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_1.java
deleted file mode 100644
index c4b1790..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_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 dxc.junit.opcodes.fload_2.jm;
-
-public class T_fload_2_1 {
-
-    public static float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_2.j
deleted file mode 100644
index 1d44d0e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fload_2_2.java
-.class public dxc/junit/opcodes/fload_2/jm/T_fload_2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 2
-
-    fload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_2.java
deleted file mode 100644
index e86cd01..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_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 dxc.junit.opcodes.fload_2.jm;
-
-public class T_fload_2_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_3.j
deleted file mode 100644
index 4cc8b98..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_3.j
+++ /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_fload_2_3.java
-.class public dxc/junit/opcodes/fload_2/jm/T_fload_2_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_2
-    
-    fload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_3.java
deleted file mode 100644
index 09a7cdf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_3.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 dxc.junit.opcodes.fload_2.jm;
-
-public class T_fload_2_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_4.j
deleted file mode 100644
index 9a1382d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_4.j
+++ /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_fload_2_4.java
-.class public dxc/junit/opcodes/fload_2/jm/T_fload_2_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_2
-    
-    fload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_4.java
deleted file mode 100644
index 082bc9e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_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 dxc.junit.opcodes.fload_2.jm;
-
-public class T_fload_2_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_5.j
deleted file mode 100644
index 8e37b39..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_5.j
+++ /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_fload_2_5.java
-.class public dxc/junit/opcodes/fload_2/jm/T_fload_2_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 3
-
-    fconst_1
-    fstore_2
-    
-    fload_2
-    fload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_5.java
deleted file mode 100644
index b3dcd24..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_5.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 dxc.junit.opcodes.fload_2.jm;
-
-public class T_fload_2_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_6.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_6.j
deleted file mode 100644
index 85d7c90..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_6.j
+++ /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_fload_2_6.java
-.class public dxc/junit/opcodes/fload_2/jm/T_fload_2_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 3
-
-    fconst_2
-    fstore_2
-
-    fload_2
-    fload 2
-    fcmpl 
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_6.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_6.java
deleted file mode 100644
index a584e41..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_2/jm/T_fload_2_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 dxc.junit.opcodes.fload_2.jm;
-
-public class T_fload_2_6 {
-
-    public static boolean run() {
-        float i = 2f;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/Test_fload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/Test_fload_3.java
deleted file mode 100644
index cd8d127..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/Test_fload_3.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fload_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fload_3.jm.T_fload_3_1;
-import dxc.junit.opcodes.fload_3.jm.T_fload_3_6;
-
-public class Test_fload_3 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(2f, T_fload_3_1.run());
-    }
-
-    /**
-     * @title equality of fload_<n> and fload <n>
-     */
-    public void testN2() {
-        assertTrue(T_fload_3_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title (index must be no greater than the value
-     * of max_locals-1).
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_3.jm.T_fload_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_3.jm.T_fload_3_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_3.jm.T_fload_3_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fload_3.jm.T_fload_3_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_1.j
deleted file mode 100644
index abe83e0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fload_3_1.java
-.class public dxc/junit/opcodes/fload_3/jm/T_fload_3_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 4
-    
-    fconst_2
-    fstore_3
-    fconst_1
-    fload_3
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_1.java
deleted file mode 100644
index f4e434b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_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 dxc.junit.opcodes.fload_3.jm;
-
-public class T_fload_3_1 {
-
-    public static float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_2.j
deleted file mode 100644
index 7b06437..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fload_3_2.java
-.class public dxc/junit/opcodes/fload_3/jm/T_fload_3_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 3
-
-    fload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_2.java
deleted file mode 100644
index 896396d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_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 dxc.junit.opcodes.fload_3.jm;
-
-public class T_fload_3_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_3.j
deleted file mode 100644
index 157316a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_3.j
+++ /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_fload_3_3.java
-.class public dxc/junit/opcodes/fload_3/jm/T_fload_3_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    dconst_1
-    dstore_3
-    
-    fload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_3.java
deleted file mode 100644
index 040faf7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_3.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 dxc.junit.opcodes.fload_3.jm;
-
-public class T_fload_3_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_4.j
deleted file mode 100644
index 8408f9e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_4.j
+++ /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_fload_3_4.java
-.class public dxc/junit/opcodes/fload_3/jm/T_fload_3_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    lconst_1
-    lstore_3
-    
-    fload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_4.java
deleted file mode 100644
index 240b801..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_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 dxc.junit.opcodes.fload_3.jm;
-
-public class T_fload_3_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_5.j
deleted file mode 100644
index e99cf7e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_5.j
+++ /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_fload_3_5.java
-.class public dxc/junit/opcodes/fload_3/jm/T_fload_3_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 4
-
-    fconst_1
-    fstore_3
-    
-    fload_3
-    fload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_5.java
deleted file mode 100644
index c1a7754..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_5.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 dxc.junit.opcodes.fload_3.jm;
-
-public class T_fload_3_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_6.j b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_6.j
deleted file mode 100644
index f61cdc8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_6.j
+++ /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_fload_3_6.java
-.class public dxc/junit/opcodes/fload_3/jm/T_fload_3_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 4
-
-    fconst_2
-    fstore_3
-
-    fload_3
-    fload 3
-    fcmpl 
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_6.java b/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_6.java
deleted file mode 100644
index 8bbff07..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fload_3/jm/T_fload_3_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 dxc.junit.opcodes.fload_3.jm;
-
-public class T_fload_3_6 {
-
-    public static boolean run() {
-        float i = 2f;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/Test_fmul.java b/tools/dx-tests/src/dxc/junit/opcodes/fmul/Test_fmul.java
deleted file mode 100644
index 0bbf1ee..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/Test_fmul.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 dxc.junit.opcodes.fmul;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fmul.jm.T_fmul_1;
-
-public class Test_fmul extends DxTestCase {
-
-    /**
-     * @title  Arguments = 2.7f, 3.14f
-     */
-    public void testN1() {
-        T_fmul_1 t = new T_fmul_1();
-        assertEquals(8.478001f, t.run(2.7f, 3.14f));
-    }
-
-    /**
-     * @title  Arguments = 0, -3.14f
-     */
-    public void testN2() {
-        T_fmul_1 t = new T_fmul_1();
-        assertEquals(-0f, t.run(0, -3.14f));
-    }
-
-    /**
-     * @title  Arguments = -2.7f, -3.14f
-     */
-    public void testN3() {
-        T_fmul_1 t = new T_fmul_1();
-        assertEquals(8.478001f, t.run(-3.14f, -2.7f));
-    }
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, Float.NaN
-     */
-    public void testB1() {
-        T_fmul_1 t = new T_fmul_1();
-        assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY, 0
-     */
-    public void testB2() {
-        T_fmul_1 t = new T_fmul_1();
-        assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY, 0));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY, -2.7f
-     */
-    public void testB3() {
-        T_fmul_1 t = new T_fmul_1();
-        assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
-                -2.7f));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY,
-     * Float.NEGATIVE_INFINITY
-     */
-    public void testB4() {
-        T_fmul_1 t = new T_fmul_1();
-        assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
-                Float.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = +0, -0f
-     */
-    public void testB5() {
-        T_fmul_1 t = new T_fmul_1();
-        assertEquals(-0f, t.run(+0f, -0f));
-    }
-
-    /**
-     * @title  Arguments = -0f, -0f
-     */
-    public void testB6() {
-        T_fmul_1 t = new T_fmul_1();
-        assertEquals(+0f, t.run(-0f, -0f));
-    }
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, Float.MAX_VALUE
-     */
-    public void testB7() {
-        T_fmul_1 t = new T_fmul_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_fmul_1 t = new T_fmul_1();
-        assertEquals(-0f, t.run(Float.MIN_VALUE, -1.4E-45f));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fmul.jm.T_fmul_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fmul.jm.T_fmul_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fmul.jm.T_fmul_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fmul.jm.T_fmul_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_1.j
deleted file mode 100644
index 474a8c2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fmul_1.java
-.class public dxc/junit/opcodes/fmul/jm/T_fmul_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-    fload_1
-    fload_2
-    fmul
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_1.java
deleted file mode 100644
index 1a12d72..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_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 dxc.junit.opcodes.fmul.jm;
-
-public class T_fmul_1 {
-
-    public float run(float a, float b) {
-        return a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_2.j
deleted file mode 100644
index 35caf66..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fmul_2.java
-.class public dxc/junit/opcodes/fmul/jm/T_fmul_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-    fload_1
-    ; fload_2    
-    fmul
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_2.java
deleted file mode 100644
index 7927d37..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_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 dxc.junit.opcodes.fmul.jm;
-
-public class T_fmul_2 {
-
-    public float run(float a, float b) {
-        return a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_3.j
deleted file mode 100644
index e11cfe1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fmul_3.java
-.class public dxc/junit/opcodes/fmul/jm/T_fmul_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FD)F
-    .limit stack 3
-    .limit locals 5
-    fload_1
-    dload_2    
-    fmul
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_3.java
deleted file mode 100644
index 7474a90..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_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 dxc.junit.opcodes.fmul.jm;
-
-public class T_fmul_3 {
-
-    public float run(float a, double b) {
-        return a*(float)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_4.j
deleted file mode 100644
index 1455bb6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_4.j
+++ /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_fmul_4.java
-.class public dxc/junit/opcodes/fmul/jm/T_fmul_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JF)F
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-;    l2f
-    fload_3
-    fmul
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_4.java
deleted file mode 100644
index 0e5200b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_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 dxc.junit.opcodes.fmul.jm;
-
-public class T_fmul_4 {
-
-    public float run(long a, float b) {
-        return (float)a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_5.j
deleted file mode 100644
index ce62cc0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fmul_5.java
-.class public dxc/junit/opcodes/fmul/jm/T_fmul_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    fload_2
-    fmul
-    freturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_5.java
deleted file mode 100644
index 9da82fa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fmul/jm/T_fmul_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 dxc.junit.opcodes.fmul.jm;
-
-public class T_fmul_5 {
-    
-    public float run(float a, float b) {
-        return a*b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/Test_fneg.java b/tools/dx-tests/src/dxc/junit/opcodes/fneg/Test_fneg.java
deleted file mode 100644
index d15f754..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/Test_fneg.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 dxc.junit.opcodes.fneg;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fneg.jm.T_fneg_1;
-
-public class Test_fneg extends DxTestCase {
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN1() {
-        T_fneg_1 t = new T_fneg_1();
-        assertEquals(-1f, t.run(1f));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN2() {
-        T_fneg_1 t = new T_fneg_1();
-        assertEquals(1f, t.run(-1f));
-    }
-
-    /**
-     * @title  Argument = +0
-     */
-    public void testN3() {
-        T_fneg_1 t = new T_fneg_1();
-        assertEquals(-0f, t.run(+0f));
-    }
-
-    /**
-     * @title  Argument = -2.7
-     */
-    public void testN4() {
-        T_fneg_1 t = new T_fneg_1();
-        assertEquals(2.7f, t.run(-2.7f));
-    }
-
-    /**
-     * @title  Argument = Float.NaN
-     */
-    public void testB1() {
-        T_fneg_1 t = new T_fneg_1();
-        assertEquals(Float.NaN, t.run(Float.NaN));
-    }
-
-    /**
-     * @title  Argument = Float.NEGATIVE_INFINITY
-     */
-    public void testB2() {
-        T_fneg_1 t = new T_fneg_1();
-        assertEquals(Float.POSITIVE_INFINITY, t.run(Float.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Argument = Float.POSITIVE_INFINITY
-     */
-    public void testB3() {
-        T_fneg_1 t = new T_fneg_1();
-        assertEquals(Float.NEGATIVE_INFINITY, t.run(Float.POSITIVE_INFINITY));
-    }
-
-    /**
-     * @title  Argument = Float.MAX_VALUE
-     */
-    public void testB4() {
-        T_fneg_1 t = new T_fneg_1();
-        assertEquals(-3.4028235E38f, t.run(Float.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Float.MIN
-     */
-    public void testB5() {
-        T_fneg_1 t = new T_fneg_1();
-        assertEquals(-1.4E-45f, t.run(Float.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fneg.jm.T_fneg_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fneg.jm.T_fneg_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fneg.jm.T_fneg_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fneg.jm.T_fneg_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_1.j
deleted file mode 100644
index ee7b958..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_1.j
+++ /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 T_ineg_1.java
-.class public dxc/junit/opcodes/fneg/jm/T_fneg_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)F
-    .limit stack 1
-    .limit locals 2
-    fload_1
-    fneg
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_1.java
deleted file mode 100644
index ed652f0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_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 dxc.junit.opcodes.fneg.jm;
-
-public class T_fneg_1 {
-
-    public float run(float d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_2.j
deleted file mode 100644
index 3d91051..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_2.j
+++ /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 T_fneg_2.java
-.class public dxc/junit/opcodes/fneg/jm/T_fneg_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)F
-    .limit stack 1
-    .limit locals 2
-    ;fload_1
-    fneg
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_2.java
deleted file mode 100644
index 9872e07..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_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 dxc.junit.opcodes.fneg.jm;
-
-public class T_fneg_2 {
-
-    public float run(float d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_3.j
deleted file mode 100644
index 0ef20fe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fneg_3.java
-.class public dxc/junit/opcodes/fneg/jm/T_fneg_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)F
-    .limit stack 2
-    .limit locals 3
-    ;fload_1
-    dconst_1
-    fneg
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_3.java
deleted file mode 100644
index 8ebcf38..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_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 dxc.junit.opcodes.fneg.jm;
-
-public class T_fneg_3 {
-
-    public float run(float d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_4.j
deleted file mode 100644
index 1e8eaad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_4.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fneg_4.java
-.class public dxc/junit/opcodes/fneg/jm/T_fneg_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)F
-    .limit stack 2
-    .limit locals 3
-    ;fload_1
-    lconst_1
-    fneg
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_4.java
deleted file mode 100644
index 97504d3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_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 dxc.junit.opcodes.fneg.jm;
-
-public class T_fneg_4 {
-
-    public float run(float d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_5.j
deleted file mode 100644
index 48e5e3a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_5.j
+++ /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_fneg_5.java
-.class public dxc/junit/opcodes/fneg/jm/T_fneg_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(F)F
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    fneg
-    freturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_5.java
deleted file mode 100644
index c46a002..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fneg/jm/T_fneg_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 dxc.junit.opcodes.fneg.jm;
-
-public class T_fneg_5 {
-    
-    public float run(float d) {
-        return -d;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/Test_frem.java b/tools/dx-tests/src/dxc/junit/opcodes/frem/Test_frem.java
deleted file mode 100644
index 4cf0a68..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/Test_frem.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 dxc.junit.opcodes.frem;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.frem.jm.T_frem_1;
-
-public class Test_frem extends DxTestCase {
-
-    /**
-     * @title Arguments = 2.7f, 3.14f
-     */
-    public void testN1() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(2.7f, t.run(2.7f, 3.14f));
-    }
-
-    /**
-     * @title  Dividend = 0
-     */
-    public void testN2() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(0f, t.run(0, 3.14f));
-    }
-
-    /**
-     * @title  Dividend is negative
-     */
-    public void testN3() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(-0.44000006f, t.run(-3.14f, 2.7f));
-    }
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, Float.NaN
-     */
-    public void testB1() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY,
-     * Float.NEGATIVE_INFINITY
-     */
-    public void testB2() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY,
-                Float.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY, -2.7f
-     */
-    public void testB3() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY, -2.7f));
-    }
-
-    /**
-     * @title  Arguments = -2.7f, Float.NEGATIVE_INFINITY
-     */
-    public void testB4() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(-2.7f, t.run(-2.7f, Float.NEGATIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = 0, 0
-     */
-    public void testB5() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(Float.NaN, t.run(0, 0));
-    }
-
-    /**
-     * @title  Arguments = 0, -2.7
-     */
-    public void testB6() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(0f, t.run(0, -2.7f));
-    }
-
-    /**
-     * @title  Arguments = -2.7, 0
-     */
-    public void testB7() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(Float.NaN, t.run(-2.7f, 0));
-    }
-
-    /**
-     * @title  Arguments = 1, Float.MAX_VALUE
-     */
-    public void testB8() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(0f, t.run(1, Float.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, -1E-9f
-     */
-    public void testB9() {
-        T_frem_1 t = new T_frem_1();
-        assertEquals(7.2584893E-10f, t.run(Float.MAX_VALUE, -1E-9f));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.frem.jm.T_frem_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.frem.jm.T_frem_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.frem.jm.T_frem_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.frem.jm.T_frem_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_1.j b/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_1.j
deleted file mode 100644
index f8bbda0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_frem_1.java
-.class public dxc/junit/opcodes/frem/jm/T_frem_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-    fload_1
-    fload_2
-    frem
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_1.java b/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_1.java
deleted file mode 100644
index e96b4b0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_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 dxc.junit.opcodes.frem.jm;
-
-public class T_frem_1 {
-
-    public float run(float a, float b) {
-        return a%b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_2.j b/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_2.j
deleted file mode 100644
index 80e3e21..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_frem_2.java
-.class public dxc/junit/opcodes/frem/jm/T_frem_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-    fload_1
-    ; fload_2    
-    frem
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_2.java b/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_2.java
deleted file mode 100644
index 86b1230..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_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 dxc.junit.opcodes.frem.jm;
-
-public class T_frem_2 {
-
-    public float run(float a, float b) {
-        return a%b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_3.j b/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_3.j
deleted file mode 100644
index 0c55f61..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_frem_3.java
-.class public dxc/junit/opcodes/frem/jm/T_frem_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FD)F
-    .limit stack 3
-    .limit locals 5
-    fload_1
-    dload_2    
-    frem
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_3.java b/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_3.java
deleted file mode 100644
index 8047356..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_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 dxc.junit.opcodes.frem.jm;
-
-public class T_frem_3 {
-
-    public float run(float a, double b) {
-        return a%(float)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_4.j b/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_4.j
deleted file mode 100644
index d179b19..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_4.j
+++ /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_frem_4.java
-.class public dxc/junit/opcodes/frem/jm/T_frem_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JF)F
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-;    l2f
-    fload_3
-    frem
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_4.java b/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_4.java
deleted file mode 100644
index ff87ad6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_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 dxc.junit.opcodes.frem.jm;
-
-public class T_frem_4 {
-
-    public float run(long a, float b) {
-        return (float)a%b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_5.j b/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_5.j
deleted file mode 100644
index c82332f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_frem_5.java
-.class public dxc/junit/opcodes/frem/jm/T_frem_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    fload_2
-    frem
-    freturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_5.java b/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_5.java
deleted file mode 100644
index 9f4f055..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/frem/jm/T_frem_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 dxc.junit.opcodes.frem.jm;
-
-public class T_frem_5 {
-    
-    public float run(float a, float b) {
-        return a%b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/Test_freturn.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/Test_freturn.java
deleted file mode 100644
index a109dfd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/Test_freturn.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.freturn;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.freturn.jm.T_freturn_1;
-import dxc.junit.opcodes.freturn.jm.T_freturn_6;
-import dxc.junit.opcodes.freturn.jm.T_freturn_7;
-import dxc.junit.opcodes.freturn.jm.T_freturn_8;
-import dxc.junit.opcodes.freturn.jm.T_freturn_9;
-
-public class Test_freturn extends DxTestCase {
-
-    /**
-     * @title  simple
-     */
-    public void testN1() {
-        T_freturn_1 t = new T_freturn_1();
-        assertEquals(123456f, t.run());
-    }
-
-    /**
-     * @title  check that frames are discarded and reinstananted correctly
-     */
-    public void testN2() {
-        T_freturn_6 t = new T_freturn_6();
-        assertEquals(123456f, t.run());
-    }
-
-    /**
-     * @title  check that monitor is released by freturn
-     */
-    public void testN3() {
-        assertTrue(T_freturn_7.execute());
-    }
-
-    /**
-     * @title  Method is synchronized but thread is not monitor owner
-     */
-    public void testE1() {
-        T_freturn_8 t = new T_freturn_8();
-        try {
-            assertTrue(t.run());
-            fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Lock structural rule 1 is violated
-     */
-    public void testE2() {
-        T_freturn_9 t = new T_freturn_9();
-        try {
-            assertEquals(1f, t.run());
-            // the JVM spec says that it is optional to implement the structural
-            // lock rules, see JVM spec 8.13 and monitorenter/exit opcodes.
-            System.out.print("dvmvfe:");
-            //fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - void
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.freturn.jm.T_freturn_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.freturn.jm.T_freturn_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.freturn.jm.T_freturn_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.freturn.jm.T_freturn_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.freturn.jm.T_freturn_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.freturn.jm.T_freturn_11");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_1.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_1.j
deleted file mode 100644
index e194867..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_1.j
+++ /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_freturn_1.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()F
-    ldc 123456.0f
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_1.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_1.java
deleted file mode 100644
index cbc1490..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_1 {
-
-    public float run() {
-        return 123456f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_10.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_10.j
deleted file mode 100644
index 0f73349..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_10.j
+++ /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_freturn_10.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_10
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private static test()F
-    .limit stack 1
-    .limit locals 0
-    fconst_1
-    freturn
-.end method
-
-
-
-.method public run()F
-    .limit stack 0
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/freturn/jm/T_freturn_10/test()F
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_10.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_10.java
deleted file mode 100644
index caa1933..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_10.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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_10 {
-    
-    private static float test()    {
-        return 1f;
-    }
-    
-    public float run() {
-        return test();
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_11.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_11.j
deleted file mode 100644
index 8143890..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_11.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_freturn_11.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()F
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    freturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_11.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_11.java
deleted file mode 100644
index 303e939..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_11 {
-    
-    public float run() {
-        return 0f;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_2.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_2.j
deleted file mode 100644
index 685f3f1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_2.j
+++ /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_freturn_2.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    fconst_0
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_2.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_2.java
deleted file mode 100644
index 6589925..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_2 {
-
-    public float run() {
-        return 0f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_3.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_3.j
deleted file mode 100644
index b1109da..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_3.j
+++ /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_freturn_3.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()D
-    .limit stack 1
-    .limit locals 1
-
-    fconst_0
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_3.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_3.java
deleted file mode 100644
index 202091d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_3 {
-
-    public float run() {
-        return 0f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_4.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_4.j
deleted file mode 100644
index 7da6dfb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_4.j
+++ /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_freturn_4.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()F
-    .limit stack 1
-    .limit locals 1
-
-    ;fconst_0
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_4.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_4.java
deleted file mode 100644
index e0503e7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_4 {
-
-    public float run() {
-        return 0f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_5.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_5.j
deleted file mode 100644
index 21c85b8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_5.j
+++ /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_freturn_5.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()F
-    .limit stack 2
-    .limit locals 1
-
-    dconst_0
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_5.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_5.java
deleted file mode 100644
index e5018c9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_5 {
-
-    public float run() {
-        return 0f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_6.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_6.j
deleted file mode 100644
index 7e7ba2c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_6.j
+++ /dev/null
@@ -1,90 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_freturn_6.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()F
-    .limit locals 6
-    .limit stack 6
-    
-    fconst_1
-    fstore_1
-    fconst_2
-    fstore_2
-    ldc 3.0f
-    fstore 3
-    
-    ldc 4.0f
-    
-    invokestatic dxc/junit/opcodes/freturn/jm/T_freturn_6/test()F
-    
-    ldc 4444.0f
-    fcmpl
-    ifne Label1
-    
-    ldc 4.0f
-    fcmpl
-    ifne Label0
-    
-    fload_1
-    fconst_1
-    fcmpl
-    ifne Label0
-    
-    fload_2
-    fconst_2
-    fcmpl
-    ifne Label0
-    
-    fload_3
-    ldc 3.0f
-    fcmpl
-    ifne Label0    
-    
-    ldc 123456.0f
-    freturn
-
-Label1:
-    pop
-Label0:
-    fconst_0
-    freturn
-
-.end method
-
-.method private static test()F
-    .limit locals 4
-    .limit stack 4
-    
-    ldc 1111.0f
-    fstore_1
-    ldc 2222.0f
-    fstore_2
-    ldc 3333.0f
-    fstore_3
-    
-    ldc 5555.0f
-    
-    ldc 4444.0f
-    freturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_6.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_6.java
deleted file mode 100644
index a6fad35..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_6 {
-
-    public float run() {
-        return 123456f;
-    }
-    
-    private static float test() {
-        float a = 1111f;
-        float b = 2222f;
-        float c = 3333f;
-        return 4444f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_7.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_7.j
deleted file mode 100644
index afa8119..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_7.j
+++ /dev/null
@@ -1,166 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_freturn_7.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_7
-.super java/lang/Object
-.implements java/lang/Runnable
-
-.field  value F
-.field  failed Z
-
-.method public <init>()V
-    .limit stack 3
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    fconst_0
-    putfield dxc.junit.opcodes.freturn.jm.T_freturn_7.value F
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.freturn.jm.T_freturn_7.failed Z
-
-    return
-
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-   
-    iconst_0
-    istore_1
-
-Label4:
-    iload_1
-    sipush 1000
-    if_icmpge Label3
-
-    aload_0
-    invokespecial dxc/junit/opcodes/freturn/jm/T_freturn_7/test()F
-    pop
-
-    iinc 1 1
-
-    goto Label4
-
-
-Label3:
-    return
-
-.end method
-
-
-
-.method private synchronized test()F
-    .limit stack 3
-    .limit locals 2
-    
-.line 16
-    aload_0
-    dup
-    getfield dxc.junit.opcodes.freturn.jm.T_freturn_7.value F
-    dup
-    fstore_1
-
-    fconst_1
-    fadd
-    putfield dxc.junit.opcodes.freturn.jm.T_freturn_7.value F
-
-    fload_1
-    fconst_1
-    fadd
-    fstore_1
-
-    invokestatic java/lang/Thread/yield()V
-
-    fload_1
-    aload_0
-    getfield dxc.junit.opcodes.freturn.jm.T_freturn_7.value F
-    fcmpl
-    ifeq Label0
-
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.freturn.jm.T_freturn_7.failed Z
-
-Label0:
-    fload_1
-    freturn
-.end method
-
-
-
-.method public static execute()Z
-    .limit stack 3
-    .limit locals 4
-
-    new dxc/junit/opcodes/freturn/jm/T_freturn_7
-    dup
-    invokespecial dxc/junit/opcodes/freturn/jm/T_freturn_7/<init>()V
-    astore_0
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_1
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_2
-
-    aload_1
-    invokevirtual java/lang/Thread/start()V
-
-    aload_2
-    invokevirtual java/lang/Thread/start()V
-
-Label12:
-    ldc2_w 5000
-    invokestatic java/lang/Thread/sleep(J)V
-
-Label13:
-    goto Label0
-
-Label14:            ; exception handler
-    astore_3
-    goto Label3
-
-Label0:
-    aload_0
-    getfield dxc.junit.opcodes.freturn.jm.T_freturn_7.value F
-    ldc 2000.0f
-    fcmpl
-    ifne Label3
-
-    aload_0
-    getfield dxc.junit.opcodes.freturn.jm.T_freturn_7.failed Z
-    ifne Label3
-
-    iconst_1
-    ireturn
-
-Label3:
-    iconst_0
-    ireturn
-
-.catch java/lang/InterruptedException from Label12 to Label13 using Label14
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_7.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_7.java
deleted file mode 100644
index af11cd1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_7.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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_7 implements Runnable {
-    public final static int CNT = 1000;
-    float value = 0;
-    boolean failed = false;
-    
-    public void run() {
-        for(int i = 0; i < CNT; i++) {
-            test();
-        }
-    }
-    
-    private synchronized float test()    {
-        value++;
-        float c = value;
-        Thread.yield();
-        if(c != value)
-            failed = true;
-        return c;
-    }
-    
-    public static boolean execute() {
-        T_freturn_7 test = new T_freturn_7();
-        Thread t1 = new Thread(test);
-        Thread t2 = new Thread(test);
-        
-        t1.start();
-        t2.start();
-        
-        try
-        {
-            Thread.sleep(5000);
-        }
-        catch(InterruptedException ie) {
-            return false;
-        }
-        
-        if(test.value != CNT * 2)
-            return false;
-        return !test.failed;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_8.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_8.j
deleted file mode 100644
index e1e6f78..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_8.j
+++ /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_freturn_8.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private synchronized test()F
-    .limit stack 1
-    aload_0
-    monitorexit
-       fconst_0
-    freturn
-.end method
-
-
-
-.method public run()Z
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial dxc/junit/opcodes/freturn/jm/T_freturn_8/test()F
-    pop
-
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_8.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_8.java
deleted file mode 100644
index 230931d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_8.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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_8 {
-    
-    private synchronized float test() {
-        return 0f;
-    }
-    
-    public boolean run() {
-        test();
-        return true;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_9.j b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_9.j
deleted file mode 100644
index e492ac2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_freturn_9.java
-.class public dxc/junit/opcodes/freturn/jm/T_freturn_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()F
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    monitorenter
-
-    fconst_1
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_9.java b/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_9.java
deleted file mode 100644
index d32b8a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/freturn/jm/T_freturn_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 dxc.junit.opcodes.freturn.jm;
-
-public class T_freturn_9 {
-    
-    public float run() {
-        return 1f;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/Test_fstore.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/Test_fstore.java
deleted file mode 100644
index 1c074f0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/Test_fstore.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fstore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fstore.jm.T_fstore_1;
-import dxc.junit.opcodes.fstore.jm.T_fstore_1_w;
-import dxc.junit.opcodes.fstore.jm.T_fstore_5;
-import dxc.junit.opcodes.fstore.jm.T_fstore_5_w;
-
-public class Test_fstore extends DxTestCase {
-
-    /*
-     * NORMAL fstore VERSION
-     */
-
-    /**
-     * @title  fstore 0
-     */
-    public void testN1() {
-        assertEquals(2f, T_fstore_1.run());
-    }
-
-    /**
-     * @title  fstore 255
-     */
-    public void testN2() {
-        assertEquals(2f, T_fstore_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1)
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore.jm.T_fstore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore.jm.T_fstore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore.jm.T_fstore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE fstore VERSION
-     */
-
-    /**
-     * @title  fstore_w 0
-     */
-    public void testN3() {
-        assertEquals(2f, T_fstore_1_w.run());
-    }
-
-    /**
-     * @title  fstore 257
-     */
-    public void testN4() {
-        assertEquals(2f, T_fstore_5_w.run());
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore.jm.T_fstore_2_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore.jm.T_fstore_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore.jm.T_fstore_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1.j
deleted file mode 100644
index ddbbeaa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_1.java
-.class public dxc/junit/opcodes/fstore/jm/T_fstore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 1
-    
-    fconst_2
-    fstore 0
-    fconst_1
-    fload 0
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1.java
deleted file mode 100644
index 546394b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_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 dxc.junit.opcodes.fstore.jm;
-
-public class T_fstore_1 {
-
-    public static float run() {
-        return 2;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1_w.j
deleted file mode 100644
index f3a2c2b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_1_w.java
-.class public dxc/junit/opcodes/fstore/jm/T_fstore_1_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 1
-    
-    fconst_2
-    fstore_w 0
-    fconst_1
-    fload 0
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1_w.java
deleted file mode 100644
index cba5c82..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_1_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fstore.jm;
-
-public class T_fstore_1_w {
-
-    public static float run() {
-        return 2;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2.j
deleted file mode 100644
index 6eb7c7d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_2.java
-.class public dxc/junit/opcodes/fstore/jm/T_fstore_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    fstore 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2.java
deleted file mode 100644
index c535d34..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_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 dxc.junit.opcodes.fstore.jm;
-
-public class T_fstore_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2_w.j
deleted file mode 100644
index 20933b4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_2_w.java
-.class public dxc/junit/opcodes/fstore/jm/T_fstore_2_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    fstore_w 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2_w.java
deleted file mode 100644
index 0664597..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_2_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fstore.jm;
-
-public class T_fstore_2_w {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3.j
deleted file mode 100644
index 75bc312..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_3.java
-.class public dxc/junit/opcodes/fstore/jm/T_fstore_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    fstore 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3.java
deleted file mode 100644
index 9fe4d51..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3.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 dxc.junit.opcodes.fstore.jm;
-
-public class T_fstore_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3_w.j
deleted file mode 100644
index a401cf0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_3_w.java
-.class public dxc/junit/opcodes/fstore/jm/T_fstore_3_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    fstore_w 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3_w.java
deleted file mode 100644
index 7b32dfe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_3_w.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 dxc.junit.opcodes.fstore.jm;
-
-public class T_fstore_3_w {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4.j
deleted file mode 100644
index 7a7ad92..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_4.java
-.class public dxc/junit/opcodes/fstore/jm/T_fstore_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    fstore 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4.java
deleted file mode 100644
index 97b94bc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_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 dxc.junit.opcodes.fstore.jm;
-
-public class T_fstore_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4_w.j
deleted file mode 100644
index afbd8e4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_4_w.java
-.class public dxc/junit/opcodes/fstore/jm/T_fstore_4_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    fstore_w 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4_w.java
deleted file mode 100644
index 0e658e0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_4_w.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 dxc.junit.opcodes.fstore.jm;
-
-public class T_fstore_4_w {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5.j
deleted file mode 100644
index 818c41f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_5.java
-.class public dxc/junit/opcodes/fstore/jm/T_fstore_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 300
-    
-    fconst_2
-    fstore 255
-    fconst_1
-    fload 255
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5.java
deleted file mode 100644
index 9b76887..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_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 dxc.junit.opcodes.fstore.jm;
-
-public class T_fstore_5 {
-
-    public static float run() {
-        return 2;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5_w.j
deleted file mode 100644
index ccc6f4c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_5_w.java
-.class public dxc/junit/opcodes/fstore/jm/T_fstore_5_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 300
-    
-    fconst_2
-    fstore_w 257
-    fconst_1
-    fload 257
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5_w.java
deleted file mode 100644
index 119ad9c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore/jm/T_fstore_5_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fstore.jm;
-
-public class T_fstore_5_w {
-
-    public static float run() {
-        return 2;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/Test_fstore_0.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/Test_fstore_0.java
deleted file mode 100644
index e512d4e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/Test_fstore_0.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fstore_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fstore_0.jm.T_fstore_0_1;
-import dxc.junit.opcodes.fstore_0.jm.T_fstore_0_5;
-
-public class Test_fstore_0 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals(2f, T_fstore_0_1.run());
-    }
-
-    /**
-     * @title equality of fstore_<n> and fstore <n>
-     */
-    public void testN2() {
-        assertTrue(T_fstore_0_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_0.jm.T_fstore_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_0.jm.T_fstore_0_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_0.jm.T_fstore_0_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_1.j
deleted file mode 100644
index 288c55e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_0_1.java
-.class public dxc/junit/opcodes/fstore_0/jm/T_fstore_0_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 1
-    
-    fconst_2
-    fstore_0
-    fconst_1
-    fload_0
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_1.java
deleted file mode 100644
index a098e2c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_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 dxc.junit.opcodes.fstore_0.jm;
-
-public class T_fstore_0_1 {
-
-    public static float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_2.j
deleted file mode 100644
index 85b0dd8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_0_2.java
-.class public dxc/junit/opcodes/fstore_0/jm/T_fstore_0_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    fstore_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_2.java
deleted file mode 100644
index 60d6932..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_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 dxc.junit.opcodes.fstore_0.jm;
-
-public class T_fstore_0_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_3.j
deleted file mode 100644
index 7f0a48a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_0_3.java
-.class public dxc/junit/opcodes/fstore_0/jm/T_fstore_0_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    fstore_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_3.java
deleted file mode 100644
index 28ae501..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_3.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 dxc.junit.opcodes.fstore_0.jm;
-
-public class T_fstore_0_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_4.j
deleted file mode 100644
index daeb302..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_0_4.java
-.class public dxc/junit/opcodes/fstore_0/jm/T_fstore_0_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    fstore_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_4.java
deleted file mode 100644
index 9ddb0f5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_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 dxc.junit.opcodes.fstore_0.jm;
-
-public class T_fstore_0_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_5.j
deleted file mode 100644
index bc5488f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_5.j
+++ /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_fstore_0_5.java
-.class public dxc/junit/opcodes/fstore_0/jm/T_fstore_0_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 2
-
-    fconst_2
-    fstore_0
-    fload_0
-
-    fconst_2
-    fstore 0
-    fload_0
-    
-    fcmpl
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_5.java
deleted file mode 100644
index caf98c1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_0/jm/T_fstore_0_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 dxc.junit.opcodes.fstore_0.jm;
-
-public class T_fstore_0_5 {
-
-    public static boolean run() {
-        float i = 2;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/Test_fstore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/Test_fstore_1.java
deleted file mode 100644
index 1cd1865..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/Test_fstore_1.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fstore_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fstore_1.jm.T_fstore_1_1;
-import dxc.junit.opcodes.fstore_1.jm.T_fstore_1_5;
-
-public class Test_fstore_1 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals(2f, T_fstore_1_1.run());
-    }
-
-    /**
-     * @title equality of fstore_<n> and fstore <n>
-     */
-    public void testN2() {
-        assertTrue(T_fstore_1_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_1.jm.T_fstore_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_1.jm.T_fstore_1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_1.jm.T_fstore_1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_1.j
deleted file mode 100644
index 4f5183e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_1_1.java
-.class public dxc/junit/opcodes/fstore_1/jm/T_fstore_1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 2
-    
-    fconst_2
-    fstore_1
-    fconst_1
-    fload_1
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_1.java
deleted file mode 100644
index 1f479a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_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 dxc.junit.opcodes.fstore_1.jm;
-
-public class T_fstore_1_1 {
-
-    public static float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_2.j
deleted file mode 100644
index 438637a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_1_2.java
-.class public dxc/junit/opcodes/fstore_1/jm/T_fstore_1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 1
-
-    fstore_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_2.java
deleted file mode 100644
index 612dead..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_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 dxc.junit.opcodes.fstore_1.jm;
-
-public class T_fstore_1_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_3.j
deleted file mode 100644
index 17895ad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_1_3.java
-.class public dxc/junit/opcodes/fstore_1/jm/T_fstore_1_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    fstore_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_3.java
deleted file mode 100644
index f202684..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_3.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 dxc.junit.opcodes.fstore_1.jm;
-
-public class T_fstore_1_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_4.j
deleted file mode 100644
index 54b2fce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_1_4.java
-.class public dxc/junit/opcodes/fstore_1/jm/T_fstore_1_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    fstore_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_4.java
deleted file mode 100644
index 2aac2d3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_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 dxc.junit.opcodes.fstore_1.jm;
-
-public class T_fstore_1_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_5.j
deleted file mode 100644
index 8f3a4cc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_5.j
+++ /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_fstore_1_5.java
-.class public dxc/junit/opcodes/fstore_1/jm/T_fstore_1_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 2
-
-    fconst_2
-    fstore_1
-    fload_1
-
-    fconst_2
-    fstore 1
-    fload_1
-    
-    fcmpl
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_5.java
deleted file mode 100644
index f7aacea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_1/jm/T_fstore_1_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 dxc.junit.opcodes.fstore_1.jm;
-
-public class T_fstore_1_5 {
-
-    public static boolean run() {
-        float i = 2;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/Test_fstore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/Test_fstore_2.java
deleted file mode 100644
index 02956aa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/Test_fstore_2.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fstore_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fstore_2.jm.T_fstore_2_1;
-import dxc.junit.opcodes.fstore_2.jm.T_fstore_2_5;
-
-public class Test_fstore_2 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals(2f, T_fstore_2_1.run());
-    }
-
-    /**
-     * @title  equality of fstore_<n> and fstore <n>
-     */
-    public void testN2() {
-        assertTrue(T_fstore_2_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_2.jm.T_fstore_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_2.jm.T_fstore_2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_2.jm.T_fstore_2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_1.j
deleted file mode 100644
index 544718b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_2_1.java
-.class public dxc/junit/opcodes/fstore_2/jm/T_fstore_2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 3
-    
-    fconst_2
-    fstore_2
-    fconst_1
-    fload_2
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_1.java
deleted file mode 100644
index af93f51..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_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 dxc.junit.opcodes.fstore_2.jm;
-
-public class T_fstore_2_1 {
-
-    public static float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_2.j
deleted file mode 100644
index 9ef2c53..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_2_2.java
-.class public dxc/junit/opcodes/fstore_2/jm/T_fstore_2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 2
-
-    fstore_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_2.java
deleted file mode 100644
index ad6e139..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_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 dxc.junit.opcodes.fstore_2.jm;
-
-public class T_fstore_2_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_3.j
deleted file mode 100644
index 931c9cd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_2_3.java
-.class public dxc/junit/opcodes/fstore_2/jm/T_fstore_2_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    fstore_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_3.java
deleted file mode 100644
index fef360e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_3.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 dxc.junit.opcodes.fstore_2.jm;
-
-public class T_fstore_2_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_4.j
deleted file mode 100644
index 1a28180..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_2_4.java
-.class public dxc/junit/opcodes/fstore_2/jm/T_fstore_2_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    fstore_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_4.java
deleted file mode 100644
index b164180..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_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 dxc.junit.opcodes.fstore_2.jm;
-
-public class T_fstore_2_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_5.j
deleted file mode 100644
index 51e53ec..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_5.j
+++ /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_fstore_2_5.java
-.class public dxc/junit/opcodes/fstore_2/jm/T_fstore_2_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 3
-
-    fconst_2
-    fstore_2
-    fload_2
-
-    fconst_2
-    fstore 2
-    fload_2
-    
-    fcmpl
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_5.java
deleted file mode 100644
index 28956f2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_2/jm/T_fstore_2_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 dxc.junit.opcodes.fstore_2.jm;
-
-public class T_fstore_2_5 {
-
-    public static boolean run() {
-        float i = 2;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/Test_fstore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/Test_fstore_3.java
deleted file mode 100644
index ef6d0a5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/Test_fstore_3.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.fstore_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fstore_3.jm.T_fstore_3_1;
-import dxc.junit.opcodes.fstore_3.jm.T_fstore_3_5;
-
-public class Test_fstore_3 extends DxTestCase {
-
-    /**
-     * @title value is stored
-     */
-    public void testN1() {
-        assertEquals(2f, T_fstore_3_1.run());
-    }
-
-    /**
-     * @title equality of fstore_<n> and fstore <n>
-     */
-    public void testN2() {
-        assertTrue(T_fstore_3_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_3.jm.T_fstore_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_3.jm.T_fstore_3_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fstore_3.jm.T_fstore_3_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_1.j
deleted file mode 100644
index 4aba4f0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_3_1.java
-.class public dxc/junit/opcodes/fstore_3/jm/T_fstore_3_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()F
-    .limit stack 2
-    .limit locals 4
-    
-    fconst_2
-    fstore_3
-    fconst_1
-    fload_3
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_1.java
deleted file mode 100644
index 5d763a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_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 dxc.junit.opcodes.fstore_3.jm;
-
-public class T_fstore_3_1 {
-
-    public static float run() {
-        return 2f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_2.j
deleted file mode 100644
index 554ba64..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_3_2.java
-.class public dxc/junit/opcodes/fstore_3/jm/T_fstore_3_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 3
-
-    fstore_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_2.java
deleted file mode 100644
index 54afaa2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_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 dxc.junit.opcodes.fstore_3.jm;
-
-public class T_fstore_3_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_3.j
deleted file mode 100644
index 3b3c30e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_3_3.java
-.class public dxc/junit/opcodes/fstore_3/jm/T_fstore_3_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    dconst_1
-    fstore_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_3.java
deleted file mode 100644
index 17de90e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_3.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 dxc.junit.opcodes.fstore_3.jm;
-
-public class T_fstore_3_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_4.j
deleted file mode 100644
index 05eb66e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fstore_3_4.java
-.class public dxc/junit/opcodes/fstore_3/jm/T_fstore_3_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    lconst_1
-    fstore_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_4.java
deleted file mode 100644
index 145fc22..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_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 dxc.junit.opcodes.fstore_3.jm;
-
-public class T_fstore_3_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_5.j
deleted file mode 100644
index 2904edd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_5.j
+++ /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_fstore_3_5.java
-.class public dxc/junit/opcodes/fstore_3/jm/T_fstore_3_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 4
-
-    fconst_2
-    fstore_3
-    fload_3
-
-    fconst_2
-    fstore 3
-    fload_3
-    
-    fcmpl
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_5.java
deleted file mode 100644
index 1bf3a26..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fstore_3/jm/T_fstore_3_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 dxc.junit.opcodes.fstore_3.jm;
-
-public class T_fstore_3_5 {
-
-    public static boolean run() {
-        float i = 2;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/Test_fsub.java b/tools/dx-tests/src/dxc/junit/opcodes/fsub/Test_fsub.java
deleted file mode 100644
index 897cd58..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/Test_fsub.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 dxc.junit.opcodes.fsub;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.fsub.jm.T_fsub_1;
-
-public class Test_fsub extends DxTestCase {
-
-    /**
-     * @title  Arguments = 2.7f, 3.14f
-     */
-    public void testN1() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(-0.44000006f, t.run(2.7f, 3.14f));
-    }
-
-    /**
-     * @title  Arguments = 0, -3.14f
-     */
-    public void testN2() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(3.14f, t.run(0, -3.14f));
-    }
-
-    /**
-     * @title Arguments = -3.14f, -2.7f
-     */
-    public void testN3() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(-0.44000006f, t.run(-3.14f, -2.7f));
-    }
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, Float.NaN
-     */
-    public void testB1() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(Float.NaN, t.run(Float.MAX_VALUE, Float.NaN));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY,
-     * Float.NEGATIVE_INFINITY
-     */
-    public void testB2() {
-        T_fsub_1 t = new T_fsub_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_fsub_1 t = new T_fsub_1();
-        assertEquals(Float.NaN, t.run(Float.POSITIVE_INFINITY,
-                Float.POSITIVE_INFINITY));
-    }
-
-    /**
-     * @title  Arguments = Float.POSITIVE_INFINITY, -2.7f
-     */
-    public void testB4() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(Float.POSITIVE_INFINITY, t.run(Float.POSITIVE_INFINITY,
-                -2.7f));
-    }
-
-    /**
-     * @title  Arguments = +0, -0f
-     */
-    public void testB5() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(+0f, t.run(+0f, -0f));
-    }
-
-    /**
-     * @title  Arguments = -0f, -0f
-     */
-    public void testB6() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(0f, t.run(-0f, -0f));
-    }
-
-    /**
-     * @title  Arguments = +0f, +0f
-     */
-    public void testB7() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(+0f, t.run(+0f, +0f));
-    }
-
-    /**
-     * @title  Arguments = 2.7f, 2.7f
-     */
-    public void testB8() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(0f, t.run(2.7f, 2.7f));
-    }
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, Float.MAX_VALUE
-     */
-    public void testB9() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(0f, t.run(Float.MAX_VALUE, Float.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Float.MIN_VALUE, -1.4E-45f
-     */
-    public void testB10() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(0f, t.run(Float.MIN_VALUE, 1.4E-45f));
-    }
-
-    /**
-     * @title  Arguments = Float.MAX_VALUE, -Float.MAX_VALUE
-     */
-    public void testB11() {
-        T_fsub_1 t = new T_fsub_1();
-        assertEquals(Float.POSITIVE_INFINITY, t.run(Float.MAX_VALUE,
-                -3.402823E+38F));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.fsub.jm.T_fsub_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.fsub.jm.T_fsub_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.fsub.jm.T_fsub_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.fsub.jm.T_fsub_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_1.j b/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_1.j
deleted file mode 100644
index 649dee4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fsub_1.java
-.class public dxc/junit/opcodes/fsub/jm/T_fsub_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-    fload_1
-    fload_2
-    fsub
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_1.java b/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_1.java
deleted file mode 100644
index 2038dfa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_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 dxc.junit.opcodes.fsub.jm;
-
-public class T_fsub_1 {
-
-    public float run(float a, float b) {
-        return a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_2.j b/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_2.j
deleted file mode 100644
index e4afbf1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fsub_2.java
-.class public dxc/junit/opcodes/fsub/jm/T_fsub_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-    fload_1
-    ; fload_2    
-    fsub
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_2.java b/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_2.java
deleted file mode 100644
index 7971658..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_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 dxc.junit.opcodes.fsub.jm;
-
-public class T_fsub_2 {
-
-    public float run(float a, float b) {
-        return a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_3.j b/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_3.j
deleted file mode 100644
index 02633be..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fsub_3.java
-.class public dxc/junit/opcodes/fsub/jm/T_fsub_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FD)F
-    .limit stack 3
-    .limit locals 5
-    fload_1
-    dload_2    
-    fsub
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_3.java b/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_3.java
deleted file mode 100644
index 9cdbf97..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_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 dxc.junit.opcodes.fsub.jm;
-
-public class T_fsub_3 {
-
-    public float run(float a, double b) {
-        return a-(float)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_4.j b/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_4.j
deleted file mode 100644
index 47c7ba9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_4.j
+++ /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_fsub_4.java
-.class public dxc/junit/opcodes/fsub/jm/T_fsub_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JF)F
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-;    l2f
-    fload_3
-    fsub
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_4.java b/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_4.java
deleted file mode 100644
index 86de9bc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_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 dxc.junit.opcodes.fsub.jm;
-
-public class T_fsub_4 {
-
-    public float run(long a, float b) {
-        return (float)a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_5.j b/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_5.j
deleted file mode 100644
index 26bb805..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_fsub_5.java
-.class public dxc/junit/opcodes/fsub/jm/T_fsub_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(FF)F
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    fload_2
-    fsub
-    freturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_5.java b/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_5.java
deleted file mode 100644
index 7687dc3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/fsub/jm/T_fsub_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 dxc.junit.opcodes.fsub.jm;
-
-public class T_fsub_5 {
-    
-    public float run(float a, float b) {
-        return a-b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/Test_getfield.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/Test_getfield.java
deleted file mode 100644
index 39f925f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/Test_getfield.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 dxc.junit.opcodes.getfield;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.getfield.jm.T_getfield_1;
-import dxc.junit.opcodes.getfield.jm.T_getfield_10;
-import dxc.junit.opcodes.getfield.jm.T_getfield_11;
-import dxc.junit.opcodes.getfield.jm.T_getfield_12;
-import dxc.junit.opcodes.getfield.jm.T_getfield_14;
-import dxc.junit.opcodes.getfield.jm.T_getfield_16;
-import dxc.junit.opcodes.getfield.jm.T_getfield_17;
-import dxc.junit.opcodes.getfield.jm.T_getfield_2;
-import dxc.junit.opcodes.getfield.jm.T_getfield_5;
-import dxc.junit.opcodes.getfield.jm.T_getfield_6;
-import dxc.junit.opcodes.getfield.jm.T_getfield_7;
-import dxc.junit.opcodes.getfield.jm.T_getfield_8;
-import dxc.junit.opcodes.getfield.jm.T_getfield_9;
-import dxc.junit.opcodes.getfield.jm.TestStubs;
-
-public class Test_getfield extends DxTestCase {
-    private int TestStubField = 123;
-    protected int TestStubFieldP = 0;
-
-    private int privateInt = 456;
-    
-    /**
-     * @title  type - int
-     */
-    public void testN1() {
-        T_getfield_1 t = new T_getfield_1();
-        assertEquals(5, t.run());
-    }
-
-    /**
-     * @title  type - double
-     */
-    public void testN2() {
-        T_getfield_2 t = new T_getfield_2();
-        assertEquals(123d, t.run());
-    }
-
-    /**
-     * @title  access protected field from subclass
-     */
-    public void testN3() {
-     // @uses dxc.junit.opcodes.getfield.jm.T_getfield_1
-        T_getfield_11 t = new T_getfield_11();
-        assertEquals(10, t.run());
-    }
-
-    /**
-     * @title  assignment compatible references
-     */
-    public void testN4() {
-        // @uses dxc.junit.opcodes.getfield.jm.TChild        
-        // @uses dxc.junit.opcodes.getfield.jm.TSuper        
-        T_getfield_14 t = new T_getfield_14();
-        assertEquals(0, t.run().compareTo("abc"));
-    }
-
-    /**
-     * @title  attempt to access static field
-     */
-    public void testE1() {
-        // @uses dxc.junit.opcodes.getstatic.jm.T_getstatic_1
-        try {
-            T_getfield_5 t = new T_getfield_5();
-            t.run();
-            fail("expected IncompatibleClassChangeError");
-        } catch (IncompatibleClassChangeError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        } 
-    }
-
-    /**
-     * @title  attempt to access of non-accessible private field
-     */
-    public void testE2() {
-        try {
-            T_getfield_6 t = new T_getfield_6();
-            int res = t.run();
-            System.out.println("res:"+res);
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NoClassDefFoundError
-     */
-    public void testE3() {
-        try {
-            // need to include the constructor call into the try-catch block,
-            // since class resolution can take place at any time.
-            // (not only when t.run() is called
-            T_getfield_7 t = new T_getfield_7();
-            t.run();
-            fail("expected NoClassDefFoundError");
-        } catch (NoClassDefFoundError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NoSuchFieldError
-     */
-    public void testE4() {
-        try {
-            T_getfield_8 t = new T_getfield_8();
-            t.run();
-            fail("expected NoSuchFieldError");
-        } catch (NoSuchFieldError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  attempt to get int from float field
-     */
-    public void testE5() {
-        try {
-            T_getfield_10 t = new T_getfield_10();
-            t.run();
-            fail("expected NoSuchFieldError");
-        } catch (NoSuchFieldError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NullPointerException
-     */
-    public void testE6() {
-        T_getfield_9 t = new T_getfield_9();
-        try {
-            t.run();
-            fail("expected NullPointerException");
-        } catch (NullPointerException e) {
-            // expected
-        }
-    }
-
-    //FIXME: "fail" commented out temporarily - check
-    /**
-     * @title  attempt to read superclass' private field from subclass
-     * in same package
-     * 
-     * FIXME: this seems to be a bug in JDK 1.5?
-     */
-    public void testE7() {
-        // @uses dxc.junit.opcodes.getfield.jm.T_getfield_1
-        try {
-            T_getfield_12 t = new T_getfield_12();
-            //fail("expected IllegalAccessError");
-        } catch (IllegalAccessError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  attempt to read private field of a class which was passed
-     * as argument
-     */
-    public void testE9() {
-        // @uses dxc.junit.opcodes.getfield.jm.TestStubs
-        try {
-            T_getfield_17 t = new T_getfield_17();
-            t.run(new dxc.junit.opcodes.getfield.jm.TestStubs());
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    
-
-    /**
-     * @title  attempt to access of non-accessible protected field
-     */
-    public void testE8() {
-        try {
-            T_getfield_16 t = new T_getfield_16();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.12
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.getfield.jm.T_getfield_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.getfield.jm.T_getfield_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.12
-     * @title constant pool type
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.getfield.jm.T_getfield_13");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.16
-     * @title assignment incompatible references
-     */
-    public void testVFE4() {
-        // @uses dxc.junit.opcodes.getfield.jm.TChild        
-        // @uses dxc.junit.opcodes.getfield.jm.TSuper        
-        try {
-            Class.forName("dxc.junit.opcodes.getfield.jm.T_getfield_15");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_1.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_1.j
deleted file mode 100644
index a669ff4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_1.j
+++ /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 T_getfield_1.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_1
-.super java/lang/Object
-
-.field public i1 I
-.field protected p1 I
-.field private pvt1 I
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_5
-    putfield dxc.junit.opcodes.getfield.jm.T_getfield_1.i1 I
-
-    aload_0
-    bipush 10
-    putfield dxc.junit.opcodes.getfield.jm.T_getfield_1.p1 I
-
-    aload_0
-    bipush 20
-    putfield dxc.junit.opcodes.getfield.jm.T_getfield_1.pvt1 I
-
-    return
-
-.end method
-
-
-
-.method public run()I
-    aload_0
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_1.i1 I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_1.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_1.java
deleted file mode 100644
index 2d0b750..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_1 {
-    public int i1 = 5;
-    protected int p1 = 10;
-    private int pvt1 = 20;
-    
-    public int run(){
-        return -99;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_10.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_10.j
deleted file mode 100644
index 0790ed3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_10.j
+++ /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_getfield_10.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_10
-.super java/lang/Object
-
-.field public i1 F
-
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0    
-    fconst_1
-    putfield dxc.junit.opcodes.getfield.jm.T_getfield_10.i1 F
-    
-
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_10.i1N I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_10.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_10.java
deleted file mode 100644
index ba7aa3d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_10 {
-    public int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_11.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_11.j
deleted file mode 100644
index 6f16f55..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_11.j
+++ /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_getfield_11.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_11
-.super dxc/junit/opcodes/getfield/jm/T_getfield_1
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/getfield/jm/T_getfield_1/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_1.p1 I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_11.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_11.java
deleted file mode 100644
index 1fefaa2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_11 extends T_getfield_1 {
-
-    public int run(){
-        return p1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_12.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_12.j
deleted file mode 100644
index 5c535f4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_12.j
+++ /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 T_getfield_12.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_12
-.super dxc/junit/opcodes/getfield/jm/T_getfield_1
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/getfield/jm/T_getfield_1/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-
-    aload_0    
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_1.pvt1 I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_12.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_12.java
deleted file mode 100644
index 6d92fce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_12 extends T_getfield_1 {
-
-    public int run(){
-        return -99;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_13.cfh b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_13.cfh
deleted file mode 100644
index 6ab7906..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_13.cfh
+++ /dev/null
@@ -1,234 +0,0 @@
-//@class:dxc/junit/opcodes/getfield/jm/T_getfield_13
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0013
-// .  .  
-   00 13 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 19, h: 0001: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 29, len 5, h: 0002: float{0x4048f5c3 / 3.14}
-    // .  @  H  .  .  
-       04 40 48 f5 c3 
-    // parsed:, offset 34, len 9, h: 0003: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 43, len 3, h: 0004: type{java.lang.Object}
-    // .  .  .  
-       07 00 01 
-    // parsed:, offset 46, len 5, h: 0005: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 03 00 06 
-    // parsed:, offset 51, len 6, h: 0006: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 57, len 7, h: 0007: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 64, len 4, h: 0008: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 68, len 13, h: 0009: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 81, len 3, h: 000a: type{dxc.junit.opcodes.getfield.jm.T_getfield_13}
-    // .  .  .  
-       07 00 11 
-    // parsed:, offset 84, len 5, h: 000b: nat{i1:I}
-    // .  .  .  .  .  
-       0c 00 0f 00 08 
-    // parsed:, offset 89, len 6, h: 000c: utf8{"()I"}
-    // .  .  .  (  )  I  
-       01 00 03 28 29 49 
-    // parsed:, offset 95, len 6, h: 000d: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 101, len 5, h: 000e: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 04 00 05 
-    // parsed:, offset 106, len 5, h: 000f: utf8{"i1"}
-    // .  .  .  i  1  
-       01 00 02 69 31 
-    // parsed:, offset 111, len 21, h: 0010: utf8{"T_getfield_13.java"}
-    // .  .  .  T  _  g  e  t  f  i  e  l  d  _  1  3  .  j  a  v  a  
-       01 00 12 54 5f 67 65 74 66 69 65 6c 64 5f 31 33 2e 6a 61 76 61 
-    // parsed:, offset 132, len 46, h: 0011: utf8{"dxc/junit/opcodes/getfield/jm/T_getfield_13"}
-    // .  .  +  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  g  e  t  f  i  e  l  d  /  j  m  /  T  _  g  e  t  f  i  e  l  d  _  1  3  
-       01 00 2b 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 67 65 74 66 69 65 6c 64 2f 6a 6d 2f 54 5f 67 65 74 66 69 65 6c 64 5f 31 33 
-    // parsed:, offset 178, len 5, h: 0012: field{dxc.junit.opcodes.getfield.jm.T_getfield_13.i1:I}
-    // .  .  .  .  .  
-       09 00 0a 00 0b 
-// parsed:, offset 183, len 0, h: end constant_pool
-// parsed:, offset 183, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 185, len 2, h: this_class: type{dxc.junit.opcodes.getfield.jm.T_getfield_13}
-// .  .  
-   00 0a 
-// parsed:, offset 187, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 04 
-// parsed:, offset 189, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 191, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:i1, offset 193, len:91,desc: I
-// parsed:, offset 193, len 0, h:  fields[0]: 
-    // parsed:, offset 193, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 195, len 2, h: name: i1
-    // .  .  
-       00 0f 
-    // parsed:, offset 197, len 2, h: descriptor: I
-    // .  .  
-       00 08 
-    // parsed:, offset 199, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 201, len 0, h: end fields[0] 
-// ========== end-ParseMember:i1, desc: I
-// parsed:, offset 201, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 203, len:81,desc: ()V
-// parsed:, offset 203, len 0, h:  methods[0]: 
-    // parsed:, offset 203, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 205, len 2, h: name: <init>
-    // .  .  
-       00 03 
-    // parsed:, offset 207, len 2, h: descriptor: ()V
-    // .  .  
-       00 06 
-    // parsed:, offset 209, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 211, len 0, h:  attributes[0]: 
-        // parsed:, offset 211, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 213, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 217, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 219, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 221, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 0e 
-        // parsed:, offset 4, len 1, h: 0004: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 5, len 1, h: 0005: iconst_5 // #+05
-        // .  
-           08 
-        // parsed:, offset 6, len 3, h: 0006: putfield field{dxc.junit.opcodes.getfield.jm.T_getfield_13.i1:I}
-        // .  .  .  
-           b5 00 12 
-        // parsed:, offset 9, len 1, h: 0009: return
-        // .  
-           b1 
-        // parsed:, offset 10, len 1, h: 000a: return
-        // .  
-           b1 
-        // parsed:, offset 236, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 238, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 240, len 0, h: end attributes[0] 
-// parsed:, offset 240, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 240, len:44,desc: ()I
-// parsed:, offset 240, len 0, h:  methods[1]: 
-    // parsed:, offset 240, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 242, len 2, h: name: run
-    // .  .  
-       00 0d 
-    // parsed:, offset 244, len 2, h: descriptor: ()I
-    // .  .  
-       00 0c 
-    // parsed:, offset 246, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 248, len 0, h:  attributes[0]: 
-        // parsed:, offset 248, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 250, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 254, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 256, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 258, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 2, h: 0000: ldc #4048f5c3 // 3.14
-        // .  .  
-           12 02 
-        // parsed:, offset 2, len 1, h: 0002: pop
-        // W  
-           57 
-        // parsed:, offset 3, len 1, h: 0003: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 4, len 3, h: 0004: getfield field{dxc.junit.opcodes.getfield.jm.T_getfield_13.i1:I}
-        // .  .  .  
-//@mod           b4 00 12 
-           b4 00 02
-        // parsed:, offset 7, len 1, h: 0007: ireturn
-        // .  
-           ac 
-        // parsed:, offset 270, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 272, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 274, len 0, h: end attributes[0] 
-// parsed:, offset 274, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()I
-// parsed:, offset 274, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 276, len 0, h:  attributes[0]: 
-    // parsed:, offset 276, len 2, h: name: SourceFile
-    // .  .  
-       00 09 
-    // parsed:, offset 278, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 282, len 2, h: source: utf8{"T_getfield_13.java"}
-    // .  .  
-       00 10 
-// parsed:, offset 284, len 0, h: end attributes[0] 
-// parsed:, offset 284, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_13.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_13.j
deleted file mode 100644
index de3b816..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_13.j
+++ /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_getfield_13.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_13
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    
-    aload_0
-    iconst_5
-    putfield dxc.junit.opcodes.getfield.jm.T_getfield_13.i1 I
-    return
-
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-    
-    ldc 3.14
-    pop
-
-    aload_0
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_13.i1 I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_13.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_13.java
deleted file mode 100644
index 3087341..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_13 {
-
-    public int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_14.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_14.j
deleted file mode 100644
index 1b8b562..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_14.j
+++ /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_getfield_14.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_14
-.super java/lang/Object
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 2
-    .limit locals 2
-
-    new dxc/junit/opcodes/getfield/jm/TChild
-    dup
-    invokespecial dxc/junit/opcodes/getfield/jm/TChild/<init>()V
-    astore_1
-
-    aload_1
-    getfield dxc.junit.opcodes.getfield.jm.TSuper.s Ljava/lang/String;
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_14.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_14.java
deleted file mode 100644
index ec06180..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_14 {
-
-    public String run() {
-        //TChild c = new TChild();
-        return null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_15.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_15.j
deleted file mode 100644
index 5c5d5a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_15.j
+++ /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_getfield_15.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_15
-.super java/lang/Object
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/Object;
-    .limit stack 2
-    .limit locals 2
-
-    new dxc/junit/opcodes/getfield/jm/TSuper
-    dup
-    invokespecial dxc/junit/opcodes/getfield/jm/TSuper/<init>()V
-    astore_1
-
-    aload_1
-    getfield dxc.junit.opcodes.getfield.jm.TChild.o Ljava/lang/Object;
-
-    areturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_15.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_15.java
deleted file mode 100644
index 7424e02..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_15.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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_15 {
-
-    public Object run() {
-        TChild s = new TChild();
-        return s.o;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_16.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_16.j
deleted file mode 100644
index 9c17d05..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_16.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_getfield_16.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_16
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-
-    new dxc/junit/opcodes/getfield/Test_getfield
-    dup
-    invokespecial dxc/junit/opcodes/getfield/Test_getfield/<init>()V
-
-    getfield dxc.junit.opcodes.getfield.Test_getfield.TestStubFieldP I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_16.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_16.java
deleted file mode 100644
index b7114d7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_16 {
-
-    public int run() {
-        return -99;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_17.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_17.j
deleted file mode 100644
index 2ef0aa4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_17.j
+++ /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_getfield_17.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_17
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ldxc/junit/opcodes/getfield/jm/TestStubs;)I
-    .limit locals 2
-    aload_1
-    getfield dxc.junit.opcodes.getfield.jm.TestStubs.privateInt I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_17.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_17.java
deleted file mode 100644
index 95d4f75..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-
-public class T_getfield_17 {
-
-    public int run(TestStubs t) {
-        return -99;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_2.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_2.j
deleted file mode 100644
index 9082c3f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_2.j
+++ /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_getfield_2.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_2
-.super java/lang/Object
-
-.field public val D
-
-.method public <init>()V
-    .limit stack 3
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0    
-    ldc2_w 123.0
-    putfield dxc.junit.opcodes.getfield.jm.T_getfield_2.val D
-
-    return
-.end method
-
-
-
-.method public run()D
-    .limit stack 3
-    .limit locals 1
-
-    aload_0
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_2.val D
-
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_2.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_2.java
deleted file mode 100644
index 36c976a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_2 {
-
-    public double val = 123.0d;
-    
-    public double run() {
-        return val;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_3.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_3.j
deleted file mode 100644
index 12c523e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_3.j
+++ /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_getfield_3.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_3
-.super java/lang/Object
-
-.field public val D
-
-.method public <init>()V
-    .limit stack 3
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    
-    aload_0
-    ldc2_w 123.0
-    putstatic dxc.junit.opcodes.getfield.jm.T_getfield_3.val D
-
-    return
-.end method
-
-
-
-.method public run()D
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_3.val D
-
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_3.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_3.java
deleted file mode 100644
index 7b91429..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_3 {
-
-    public double val = 123.0d;
-    
-    public double run() {
-        return val;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_4.cfh
deleted file mode 100644
index e6a6403..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_4.cfh
+++ /dev/null
@@ -1,225 +0,0 @@
-//@class:dxc/junit/opcodes/getfield/jm/T_getfield_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0f 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"()I"}
-    // .  .  .  (  )  I  
-       01 00 03 28 29 49 
-    // parsed:, offset 62, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 68, len 20, h: 0007: utf8{"T_getfield_4.java"}
-    // .  .  .  T  _  g  e  t  f  i  e  l  d  _  4  .  j  a  v  a  
-       01 00 11 54 5f 67 65 74 66 69 65 6c 64 5f 34 2e 6a 61 76 61 
-    // parsed:, offset 88, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0e 
-    // parsed:, offset 93, len 5, h: 0009: utf8{"i1"}
-    // .  .  .  i  1  
-       01 00 02 69 31 
-    // parsed:, offset 98, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 105, len 45, h: 000b: utf8{"dxc/junit/opcodes/getfield/jm/T_getfield_4"}
-    // .  .  *  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  g  e  t  f  i  e  l  d  /  j  m  /  T  _  g  e  t  f  i  e  l  d  _  4  
-       01 00 2a 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 67 65 74 66 69 65 6c 64 2f 6a 6d 2f 54 5f 67 65 74 66 69 65 6c 64 5f 34 
-    // parsed:, offset 150, len 3, h: 000c: type{dxc.junit.opcodes.getfield.jm.T_getfield_4}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 153, len 5, h: 000d: field{dxc.junit.opcodes.getfield.jm.T_getfield_4.i1:I}
-    // .  .  .  .  .  
-       09 00 0c 00 11 
-    // parsed:, offset 158, len 6, h: 000e: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 164, len 3, h: 000f: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 167, len 4, h: 0010: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 171, len 5, h: 0011: nat{i1:I}
-    // .  .  .  .  .  
-       0c 00 09 00 10 
-// parsed:, offset 176, len 0, h: end constant_pool
-// parsed:, offset 176, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 178, len 2, h: this_class: type{dxc.junit.opcodes.getfield.jm.T_getfield_4}
-// .  .  
-   00 0c 
-// parsed:, offset 180, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0f 
-// parsed:, offset 182, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 184, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:i1, offset 186, len:88,desc: I
-// parsed:, offset 186, len 0, h:  fields[0]: 
-    // parsed:, offset 186, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 188, len 2, h: name: i1
-    // .  .  
-       00 09 
-    // parsed:, offset 190, len 2, h: descriptor: I
-    // .  .  
-       00 10 
-    // parsed:, offset 192, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 194, len 0, h: end fields[0] 
-// ========== end-ParseMember:i1, desc: I
-// parsed:, offset 194, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 196, len:78,desc: ()V
-// parsed:, offset 196, len 0, h:  methods[0]: 
-    // parsed:, offset 196, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 198, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 200, len 2, h: descriptor: ()V
-    // .  .  
-       00 0e 
-    // parsed:, offset 202, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 204, len 0, h:  attributes[0]: 
-        // parsed:, offset 204, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 206, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 210, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 212, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 214, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 5, len 1, h: 0005: iconst_5 // #+05
-        // .  
-           08 
-        // parsed:, offset 6, len 3, h: 0006: putfield field{dxc.junit.opcodes.getfield.jm.T_getfield_4.i1:I}
-        // .  .  .  
-           b5 00 0d 
-        // parsed:, offset 9, len 1, h: 0009: return
-        // .  
-           b1 
-        // parsed:, offset 10, len 1, h: 000a: return
-        // .  
-           b1 
-        // parsed:, offset 229, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 231, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 233, len 0, h: end attributes[0] 
-// parsed:, offset 233, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 233, len:41,desc: ()I
-// parsed:, offset 233, len 0, h:  methods[1]: 
-    // parsed:, offset 233, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 235, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 237, len 2, h: descriptor: ()I
-    // .  .  
-       00 05 
-    // parsed:, offset 239, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 241, len 0, h:  attributes[0]: 
-        // parsed:, offset 241, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 243, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 247, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 249, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 251, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: getfield field{dxc.junit.opcodes.getfield.jm.T_getfield_4.i1:I}
-        // .  .  .  
-//@mod           b4 00 0d 
-           b4 01 0d 
-        // parsed:, offset 4, len 1, h: 0004: ireturn
-        // .  
-           ac 
-        // parsed:, offset 260, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 262, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 264, len 0, h: end attributes[0] 
-// parsed:, offset 264, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()I
-// parsed:, offset 264, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 266, len 0, h:  attributes[0]: 
-    // parsed:, offset 266, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 268, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 272, len 2, h: source: utf8{"T_getfield_4.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 274, len 0, h: end attributes[0] 
-// parsed:, offset 274, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_4.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_4.j
deleted file mode 100644
index 815e7a8b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_4.j
+++ /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_getfield_4.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_4
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    
-    aload_0
-    iconst_5
-    putfield dxc.junit.opcodes.getfield.jm.T_getfield_4.i1 I
-    return
-    
-
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_4.i1 I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_4.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_4.java
deleted file mode 100644
index 2c9c301..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_4 {
-
-    public int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_5.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_5.j
deleted file mode 100644
index 172f791..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_5.j
+++ /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_getfield_5.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_5
-.super java/lang/Object
-
-.field public static i1 I
-
-.method static <clinit>()V
-    .limit stack 1
-    .limit locals 0
-
-    iconst_5
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_1.i1 I
-    
-    return
-.end method
-
-.method public <init>()V
-    .limit stack 2
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_5.i1 I
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_5.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_5.java
deleted file mode 100644
index 34ca783..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_5 {
-
-    public static int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_6.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_6.j
deleted file mode 100644
index dcf9a08..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_getfield_6.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-
-    new dxc/junit/opcodes/getfield/Test_getfield
-    dup
-    invokespecial dxc/junit/opcodes/getfield/Test_getfield/<init>()V
-
-    getfield dxc.junit.opcodes.getfield.Test_getfield.TestStubField I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_6.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_6.java
deleted file mode 100644
index 07ab1b0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_6 {
-
-    public int run() {
-        return -99;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_7.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_7.j
deleted file mode 100644
index ebffccc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_7.j
+++ /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_getfield_7.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_7
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    .limit stack 2
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    aload_0
-    iconst_5
-    putfield dxc.junit.opcodes.getfield.jm.T_getfield_7.i1 I
-    return
-.end method
-
-.method public run()I
-    aload_0
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_7abc.i1 I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_7.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_7.java
deleted file mode 100644
index ad0b3a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_7 {
-    public int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_8.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_8.j
deleted file mode 100644
index 1d3e3d7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_8.j
+++ /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_getfield_8.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_8
-.super java/lang/Object
-
-.field public i1 I
-
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    
-    aload_0
-    iconst_5
-    putfield dxc.junit.opcodes.getfield.jm.T_getfield_8.i1 I
-
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-    
-    aload_0
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_8.i1N I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_8.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_8.java
deleted file mode 100644
index 884d068..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_8 {
-    public int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_9.j b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_9.j
deleted file mode 100644
index b2fd59d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_9.j
+++ /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_getfield_9.java
-.class public dxc/junit/opcodes/getfield/jm/T_getfield_9
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0    
-    iconst_5
-    putfield dxc.junit.opcodes.getfield.jm.T_getfield_9.i1 I
-    
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-;    aload_0
-    aconst_null
-    getfield dxc.junit.opcodes.getfield.jm.T_getfield_9.i1 I
-
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_9.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_9.java
deleted file mode 100644
index f2868db..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/T_getfield_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 dxc.junit.opcodes.getfield.jm;
-
-public class T_getfield_9 {
-    public int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/TestStubs.java
deleted file mode 100644
index 09b654f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getfield/jm/TestStubs.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 dxc.junit.opcodes.getfield.jm;
-
-
-
-class TSuper {
-    public String s = "abc";
-}
-
-class TChild extends TSuper {
-    public Object o = null;    
-}
-
-public class TestStubs {
-    private int privateInt = 456;
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/TestStubs.java
deleted file mode 100644
index b681d91..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/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 dxc.junit.opcodes.getstatic;
-
-public class TestStubs {
-    private static int TestStubField = 50;
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/Test_getstatic.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/Test_getstatic.java
deleted file mode 100644
index 290cc0e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/Test_getstatic.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.getstatic;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.getstatic.jm.T_getstatic_1;
-import dxc.junit.opcodes.getstatic.jm.T_getstatic_10;
-import dxc.junit.opcodes.getstatic.jm.T_getstatic_11;
-import dxc.junit.opcodes.getstatic.jm.T_getstatic_12;
-import dxc.junit.opcodes.getstatic.jm.T_getstatic_2;
-import dxc.junit.opcodes.getstatic.jm.T_getstatic_5;
-import dxc.junit.opcodes.getstatic.jm.T_getstatic_6;
-import dxc.junit.opcodes.getstatic.jm.T_getstatic_7;
-import dxc.junit.opcodes.getstatic.jm.T_getstatic_8;
-import dxc.junit.opcodes.getstatic.jm.T_getstatic_9;
-
-public class Test_getstatic extends DxTestCase {
-    
-    /**
-     * @title  type - int
-     */
-    public void testN1() {
-        T_getstatic_1 t = new T_getstatic_1();
-        assertEquals(5, t.run());
-    }
-
-    /**
-     * @title  type - double
-     */
-    public void testN2() {
-        T_getstatic_2 t = new T_getstatic_2();
-        assertEquals(123d, t.run());
-    }
-
-    /**
-     * @title  access protected field from subclass
-     */
-    public void testN3() {
-        // @uses dxc.junit.opcodes.getstatic.jm.T_getstatic_1
-        T_getstatic_11 t = new T_getstatic_11();
-        assertEquals(10, t.run());
-    }
-
-    /**
-     * @title  attempt to access non-static field
-     */
-    public void testE1() {
-        T_getstatic_5 t = new T_getstatic_5();
-        try {
-            t.run();
-            fail("expected IncompatibleClassChangeError");
-        } catch (IncompatibleClassChangeError e) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  attempt to access of non-accessible field
-     */
-    public void testE2() {
-        // @uses dxc.junit.opcodes.getstatic.TestStubs        
-        try {
-            T_getstatic_6 t = new T_getstatic_6();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NoClassDefFoundError
-     */
-    public void testE3() {
-        try {
-            T_getstatic_7 t = new T_getstatic_7();
-            t.run();
-            fail("expected NoClassDefFoundError");
-        } catch (NoClassDefFoundError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NoSuchFieldError
-     */
-    public void testE4() {
-        try {
-               T_getstatic_8 t = new T_getstatic_8();
-            t.run();
-            fail("expected NoSuchFieldError");
-        } catch (NoSuchFieldError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  attempt to get int from float field
-     */
-    public void testE5() {
-        try {
-            T_getstatic_10 t = new T_getstatic_10();
-            t.run();
-            fail("expected NoSuchFieldError");
-        } catch (NoSuchFieldError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  initialization of referenced class throws exception
-     */
-    public void testE6() {
-        // @uses dxc.junit.opcodes.getstatic.jm.StubInitError
-        T_getstatic_9 t = new T_getstatic_9();
-        try {
-            t.run();
-            fail("expected Error");
-        } catch (Error e) {
-            // expected
-        }
-    }
-
-    //  FIXME: "fail" commented out temporarily - check
-    /**
-     * @title  attempt to read superclass' private field from subclass
-     * 
-     * FIXME: is this a JVM bug?
-     */
-    public void testE7() {
-        // @uses dxc.junit.opcodes.getstatic.jm.T_getstatic_1
-        try {
-            T_getstatic_12 t = new T_getstatic_12();
-            t.run();
-            //fail("expected IllegalAccessError");
-        } catch (IllegalAccessError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.12
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.getstatic.jm.T_getstatic_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.getstatic.jm.T_getstatic_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.12
-     * @title constant pool type
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.getstatic.jm.T_getstatic_13");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_1.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_1.j
deleted file mode 100644
index 3143fda..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_1.j
+++ /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.
-
-.source T_getstatic_1.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_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 stack 1
-    .limit locals 0
-
-    iconst_5
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_1.i1 I
-    
-    ldc 10
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_1.p1 I
-    
-    ldc 20
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_1.pvt1 I
-    return
-
-.end method
-
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_1.i1 I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_1.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_1.java
deleted file mode 100644
index 052182e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_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/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_10.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_10.j
deleted file mode 100644
index 29880ed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_10.j
+++ /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 T_getstatic_10.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_10
-.super java/lang/Object
-
-.field public static i1 F
-
-.method static <clinit>()V
-    .limit stack 1
-    .limit locals 0
-
-    fconst_1
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_10.i1 F
-    return
-
-.end method
-
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_10.i1N I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_10.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_10.java
deleted file mode 100644
index 0dda175..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_10 {
-    public static int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_11.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_11.j
deleted file mode 100644
index aaa565b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_11.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_getstatic_11.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_11
-.super dxc/junit/opcodes/getstatic/jm/T_getstatic_1
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/getstatic/jm/T_getstatic_1/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_1.p1 I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_11.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_11.java
deleted file mode 100644
index 25923d4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_11 extends T_getstatic_1 {
-
-    public int run(){
-        return p1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_12.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_12.j
deleted file mode 100644
index 72385f8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_12.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_getstatic_12.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_12
-.super dxc/junit/opcodes/getstatic/jm/T_getstatic_1
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/getstatic/jm/T_getstatic_1/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_1.pvt1 I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_12.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_12.java
deleted file mode 100644
index ee091a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_12 extends T_getstatic_1 {
-
-    public int run(){
-        return -99;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_13.cfh b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_13.cfh
deleted file mode 100644
index 92ad194..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_13.cfh
+++ /dev/null
@@ -1,270 +0,0 @@
-//@class:dxc/junit/opcodes/getstatic/jm/T_getstatic_13
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0014
-// .  .  
-   00 14 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 19, h: 0001: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 29, len 5, h: 0002: float{0x4048f5c3 / 3.14}
-    // .  @  H  .  .  
-       04 40 48 f5 c3 
-    // parsed:, offset 34, len 9, h: 0003: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 43, len 3, h: 0004: type{java.lang.Object}
-    // .  .  .  
-       07 00 01 
-    // parsed:, offset 46, len 5, h: 0005: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 03 00 07 
-    // parsed:, offset 51, len 11, h: 0006: utf8{"<clinit>"}
-    // .  .  .  <  c  l  i  n  i  t  >  
-       01 00 08 3c 63 6c 69 6e 69 74 3e 
-    // parsed:, offset 62, len 6, h: 0007: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 68, len 5, h: 0008: field{dxc.junit.opcodes.getstatic.jm.T_getstatic_13.i1:I}
-    // .  .  .  .  .  
-       09 00 11 00 0d 
-    // parsed:, offset 73, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 80, len 13, h: 000a: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 93, len 4, h: 000b: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 97, len 48, h: 000c: utf8{"dxc/junit/opcodes/getstatic/jm/T_getstatic_13"}
-    // .  .  -  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  g  e  t  s  t  a  t  i  c  /  j  m  /  T  _  g  e  t  s  t  a  t  i  c  _  1  3  
-       01 00 2d 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 67 65 74 73 74 61 74 69 63 2f 6a 6d 2f 54 5f 67 65 74 73 74 61 74 69 63 5f 31 33 
-    // parsed:, offset 145, len 5, h: 000d: nat{i1:I}
-    // .  .  .  .  .  
-       0c 00 12 00 0b 
-    // parsed:, offset 150, len 6, h: 000e: utf8{"()I"}
-    // .  .  .  (  )  I  
-       01 00 03 28 29 49 
-    // parsed:, offset 156, len 6, h: 000f: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 162, len 5, h: 0010: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 04 00 05 
-    // parsed:, offset 167, len 3, h: 0011: type{dxc.junit.opcodes.getstatic.jm.T_getstatic_13}
-    // .  .  .  
-       07 00 0c 
-    // parsed:, offset 170, len 5, h: 0012: utf8{"i1"}
-    // .  .  .  i  1  
-       01 00 02 69 31 
-    // parsed:, offset 175, len 22, h: 0013: utf8{"T_getstatic_13.java"}
-    // .  .  .  T  _  g  e  t  s  t  a  t  i  c  _  1  3  .  j  a  v  a  
-       01 00 13 54 5f 67 65 74 73 74 61 74 69 63 5f 31 33 2e 6a 61 76 61 
-// parsed:, offset 197, len 0, h: end constant_pool
-// parsed:, offset 197, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 199, len 2, h: this_class: type{dxc.junit.opcodes.getstatic.jm.T_getstatic_13}
-// .  .  
-   00 11 
-// parsed:, offset 201, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 04 
-// parsed:, offset 203, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 205, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:i1, offset 207, len:115,desc: I
-// parsed:, offset 207, len 0, h:  fields[0]: 
-    // parsed:, offset 207, len 2, h: access_flags: public|static
-    // .  .  
-       00 09 
-    // parsed:, offset 209, len 2, h: name: i1
-    // .  .  
-       00 12 
-    // parsed:, offset 211, len 2, h: descriptor: I
-    // .  .  
-       00 0b 
-    // parsed:, offset 213, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 215, len 0, h: end fields[0] 
-// ========== end-ParseMember:i1, desc: I
-// parsed:, offset 215, len 2, h: methods_count: 0003
-// .  .  
-   00 03 
-// ========== start-ParseMember:<clinit>, offset 217, len:105,desc: ()V
-// parsed:, offset 217, len 0, h:  methods[0]: 
-    // parsed:, offset 217, len 2, h: access_flags: static
-    // .  .  
-       00 08 
-    // parsed:, offset 219, len 2, h: name: <clinit>
-    // .  .  
-       00 06 
-    // parsed:, offset 221, len 2, h: descriptor: ()V
-    // .  .  
-       00 07 
-    // parsed:, offset 223, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 225, len 0, h:  attributes[0]: 
-        // parsed:, offset 225, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 227, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 231, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 233, len 2, h: max_locals: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 235, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: iconst_5 // #+05
-        // .  
-           08 
-        // parsed:, offset 1, len 3, h: 0001: putstatic field{dxc.junit.opcodes.getstatic.jm.T_getstatic_13.i1:I}
-        // .  .  .  
-           b3 00 08 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 244, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 246, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 248, len 0, h: end attributes[0] 
-// parsed:, offset 248, len 0, h: end methods[0] 
-// ========== end-ParseMember:<clinit>, desc: ()V
-// ========== start-ParseMember:<init>, offset 248, len:74,desc: ()V
-// parsed:, offset 248, len 0, h:  methods[1]: 
-    // parsed:, offset 248, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 250, len 2, h: name: <init>
-    // .  .  
-       00 03 
-    // parsed:, offset 252, len 2, h: descriptor: ()V
-    // .  .  
-       00 07 
-    // parsed:, offset 254, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 256, len 0, h:  attributes[0]: 
-        // parsed:, offset 256, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 258, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 262, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 264, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 266, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 10 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 275, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 277, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 279, len 0, h: end attributes[0] 
-// parsed:, offset 279, len 0, h: end methods[1] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 279, len:43,desc: ()I
-// parsed:, offset 279, len 0, h:  methods[2]: 
-    // parsed:, offset 279, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 281, len 2, h: name: run
-    // .  .  
-       00 0f 
-    // parsed:, offset 283, len 2, h: descriptor: ()I
-    // .  .  
-       00 0e 
-    // parsed:, offset 285, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 287, len 0, h:  attributes[0]: 
-        // parsed:, offset 287, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 289, len 4, h: length: 00000013
-        // .  .  .  .  
-           00 00 00 13 
-        // parsed:, offset 293, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 295, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 297, len 4, h: code_length: 00000007
-        // .  .  .  .  
-           00 00 00 07 
-        // parsed:, offset 0, len 2, h: 0000: ldc #4048f5c3 // 3.14
-        // .  .  
-           12 02 
-        // parsed:, offset 2, len 1, h: 0002: pop
-        // W  
-           57 
-        // parsed:, offset 3, len 3, h: 0003: getstatic field{dxc.junit.opcodes.getstatic.jm.T_getstatic_13.i1:I}
-        // .  .  .  
-//@mod           b2 00 08 
-           b2 00 02 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 308, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 310, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 312, len 0, h: end attributes[0] 
-// parsed:, offset 312, len 0, h: end methods[2] 
-// ========== end-ParseMember:run, desc: ()I
-// parsed:, offset 312, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 314, len 0, h:  attributes[0]: 
-    // parsed:, offset 314, len 2, h: name: SourceFile
-    // .  .  
-       00 0a 
-    // parsed:, offset 316, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 320, len 2, h: source: utf8{"T_getstatic_13.java"}
-    // .  .  
-       00 13 
-// parsed:, offset 322, len 0, h: end attributes[0] 
-// parsed:, offset 322, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_13.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_13.j
deleted file mode 100644
index 7d3769a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_13.j
+++ /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_getstatic_13.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_13
-.super java/lang/Object
-
-.field public static i1 I
-
-.method static <clinit>()V
-    .limit stack 1
-    .limit locals 0
-
-    iconst_5
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_13.i1 I
-    return
-
-.end method
-
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-    
-    ldc 3.14
-    pop
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_13.i1 I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_13.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_13.java
deleted file mode 100644
index 37f5811..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_13 {
-
-    public static int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_2.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_2.j
deleted file mode 100644
index dcd4322..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_2.j
+++ /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_getstatic_2.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_2
-.super java/lang/Object
-
-.field public static val D
-
-.method static <clinit>()V
-    .limit stack 2
-    .limit locals 0
-
-    ldc2_w 123.0
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_2.val D
-
-    return
-.end method
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()D
-    .limit stack 2
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_2.val D
-
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_2.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_2.java
deleted file mode 100644
index f9f2d23..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_2 {
-
-    public static double val = 123.0d;
-    
-    public double run() {
-        return val;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_3.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_3.j
deleted file mode 100644
index cb47889..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_3.j
+++ /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_getstatic_3.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_3
-.super java/lang/Object
-
-.field public static val D
-
-.method static <clinit>()V
-    .limit stack 2
-    .limit locals 0
-
-    ldc2_w 123.0
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_3.val D
-
-    return
-.end method
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()D
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_3.val D
-
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_3.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_3.java
deleted file mode 100644
index 98d1f15..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_3 {
-
-    public static double val = 123.0d;
-    
-    public double run() {
-        return val;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_4.cfh
deleted file mode 100644
index b384bf3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_4.cfh
+++ /dev/null
@@ -1,261 +0,0 @@
-//@class:dxc/junit/opcodes/getstatic/jm/T_getstatic_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0013
-// .  .  
-   00 13 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: nat{i1:I}
-    // .  .  .  .  .  
-       0c 00 11 00 0c 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 9, h: 0003: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 43, len 47, h: 0004: utf8{"dxc/junit/opcodes/getstatic/jm/T_getstatic_4"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  g  e  t  s  t  a  t  i  c  /  j  m  /  T  _  g  e  t  s  t  a  t  i  c  _  4  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 67 65 74 73 74 61 74 69 63 2f 6a 6d 2f 54 5f 67 65 74 73 74 61 74 69 63 5f 34 
-    // parsed:, offset 90, len 3, h: 0005: type{dxc.junit.opcodes.getstatic.jm.T_getstatic_4}
-    // .  .  .  
-       07 00 04 
-    // parsed:, offset 93, len 6, h: 0006: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 99, len 7, h: 0007: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 106, len 11, h: 0008: utf8{"<clinit>"}
-    // .  .  .  <  c  l  i  n  i  t  >  
-       01 00 08 3c 63 6c 69 6e 69 74 3e 
-    // parsed:, offset 117, len 13, h: 0009: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 130, len 5, h: 000a: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 03 00 06 
-    // parsed:, offset 135, len 3, h: 000b: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 138, len 4, h: 000c: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 142, len 6, h: 000d: utf8{"()I"}
-    // .  .  .  (  )  I  
-       01 00 03 28 29 49 
-    // parsed:, offset 148, len 6, h: 000e: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 154, len 5, h: 000f: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0b 00 0a 
-    // parsed:, offset 159, len 5, h: 0010: field{dxc.junit.opcodes.getstatic.jm.T_getstatic_4.i1:I}
-    // .  .  .  .  .  
-       09 00 05 00 01 
-    // parsed:, offset 164, len 5, h: 0011: utf8{"i1"}
-    // .  .  .  i  1  
-       01 00 02 69 31 
-    // parsed:, offset 169, len 21, h: 0012: utf8{"T_getstatic_4.java"}
-    // .  .  .  T  _  g  e  t  s  t  a  t  i  c  _  4  .  j  a  v  a  
-       01 00 12 54 5f 67 65 74 73 74 61 74 69 63 5f 34 2e 6a 61 76 61 
-// parsed:, offset 190, len 0, h: end constant_pool
-// parsed:, offset 190, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 192, len 2, h: this_class: type{dxc.junit.opcodes.getstatic.jm.T_getstatic_4}
-// .  .  
-   00 05 
-// parsed:, offset 194, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0b 
-// parsed:, offset 196, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 198, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:i1, offset 200, len:112,desc: I
-// parsed:, offset 200, len 0, h:  fields[0]: 
-    // parsed:, offset 200, len 2, h: access_flags: public|static
-    // .  .  
-       00 09 
-    // parsed:, offset 202, len 2, h: name: i1
-    // .  .  
-       00 11 
-    // parsed:, offset 204, len 2, h: descriptor: I
-    // .  .  
-       00 0c 
-    // parsed:, offset 206, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 208, len 0, h: end fields[0] 
-// ========== end-ParseMember:i1, desc: I
-// parsed:, offset 208, len 2, h: methods_count: 0003
-// .  .  
-   00 03 
-// ========== start-ParseMember:<clinit>, offset 210, len:102,desc: ()V
-// parsed:, offset 210, len 0, h:  methods[0]: 
-    // parsed:, offset 210, len 2, h: access_flags: static
-    // .  .  
-       00 08 
-    // parsed:, offset 212, len 2, h: name: <clinit>
-    // .  .  
-       00 08 
-    // parsed:, offset 214, len 2, h: descriptor: ()V
-    // .  .  
-       00 06 
-    // parsed:, offset 216, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 218, len 0, h:  attributes[0]: 
-        // parsed:, offset 218, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 220, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 224, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 2, h: max_locals: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 228, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: iconst_5 // #+05
-        // .  
-           08 
-        // parsed:, offset 1, len 3, h: 0001: putstatic field{dxc.junit.opcodes.getstatic.jm.T_getstatic_4.i1:I}
-        // .  .  .  
-           b3 00 10 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 237, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 239, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 241, len 0, h: end attributes[0] 
-// parsed:, offset 241, len 0, h: end methods[0] 
-// ========== end-ParseMember:<clinit>, desc: ()V
-// ========== start-ParseMember:<init>, offset 241, len:71,desc: ()V
-// parsed:, offset 241, len 0, h:  methods[1]: 
-    // parsed:, offset 241, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 243, len 2, h: name: <init>
-    // .  .  
-       00 03 
-    // parsed:, offset 245, len 2, h: descriptor: ()V
-    // .  .  
-       00 06 
-    // parsed:, offset 247, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 249, len 0, h:  attributes[0]: 
-        // parsed:, offset 249, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 251, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 255, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 257, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 259, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 0f 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 268, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 270, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 272, len 0, h: end attributes[0] 
-// parsed:, offset 272, len 0, h: end methods[1] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 272, len:40,desc: ()I
-// parsed:, offset 272, len 0, h:  methods[2]: 
-    // parsed:, offset 272, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 274, len 2, h: name: run
-    // .  .  
-       00 0e 
-    // parsed:, offset 276, len 2, h: descriptor: ()I
-    // .  .  
-       00 0d 
-    // parsed:, offset 278, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 280, len 0, h:  attributes[0]: 
-        // parsed:, offset 280, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 282, len 4, h: length: 00000010
-        // .  .  .  .  
-           00 00 00 10 
-        // parsed:, offset 286, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 288, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 290, len 4, h: code_length: 00000004
-        // .  .  .  .  
-           00 00 00 04 
-        // parsed:, offset 0, len 3, h: 0000: getstatic field{dxc.junit.opcodes.getstatic.jm.T_getstatic_4.i1:I}
-        // .  .  .  
-//@mod           b2 00 10 
-           b2 01 10 
-        // parsed:, offset 3, len 1, h: 0003: ireturn
-        // .  
-           ac 
-        // parsed:, offset 298, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 300, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 302, len 0, h: end attributes[0] 
-// parsed:, offset 302, len 0, h: end methods[2] 
-// ========== end-ParseMember:run, desc: ()I
-// parsed:, offset 302, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 304, len 0, h:  attributes[0]: 
-    // parsed:, offset 304, len 2, h: name: SourceFile
-    // .  .  
-       00 09 
-    // parsed:, offset 306, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 310, len 2, h: source: utf8{"T_getstatic_4.java"}
-    // .  .  
-       00 12 
-// parsed:, offset 312, len 0, h: end attributes[0] 
-// parsed:, offset 312, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_4.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_4.j
deleted file mode 100644
index 349b217..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_4.j
+++ /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 T_getstatic_4.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_4
-.super java/lang/Object
-
-.field public static i1 I
-
-.method static <clinit>()V
-    .limit stack 1
-    .limit locals 0
-
-    iconst_5
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_4.i1 I
-    return
-
-.end method
-
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_4.i1 I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_4.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_4.java
deleted file mode 100644
index 2fa815d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_4 {
-
-    public static int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_5.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_5.j
deleted file mode 100644
index 0f26e28..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_5.j
+++ /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_getstatic_5.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_5
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    .limit stack 2
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_5
-    putfield dxc.junit.opcodes.getstatic.jm.T_getstatic_5.i1 I
-
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_5.i1 I
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_5.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_5.java
deleted file mode 100644
index d183ca4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_5 {
-
-    public int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_6.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_6.j
deleted file mode 100644
index ba60eb9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_6.j
+++ /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_getstatic_6.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    getstatic dxc.junit.opcodes.getstatic.TestStubs.TestStubField I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_6.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_6.java
deleted file mode 100644
index 746d6a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_6 {
-
-    public int run() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_7.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_7.j
deleted file mode 100644
index ecb55ef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_7.j
+++ /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 T_getstatic_7.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_7
-.super java/lang/Object
-
-.field public static i1 I
-
-.method static <clinit>()V
-    .limit stack 1
-    .limit locals 0
-
-    iconst_5
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_7.i1 I
-    return
-
-.end method
-
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_71.i1 I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_7.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_7.java
deleted file mode 100644
index 362759e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_7 {
-    public static int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_8.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_8.j
deleted file mode 100644
index 5391bed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_8.j
+++ /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 T_getstatic_8.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_8
-.super java/lang/Object
-
-.field public static i1 I
-
-.method static <clinit>()V
-    .limit stack 1
-    .limit locals 0
-
-    iconst_5
-    putstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_8.i1 I
-    return
-
-.end method
-
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.T_getstatic_8.i1N I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_8.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_8.java
deleted file mode 100644
index d187e34..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_8 {
-    public static int i1 = 5;
-    public int run(){
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_9.j b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_9.j
deleted file mode 100644
index f7a7c9f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_9.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_getstatic_9.java
-.class public dxc/junit/opcodes/getstatic/jm/T_getstatic_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.getstatic.jm.StubInitError.value I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_9.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_9.java
deleted file mode 100644
index e569935..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/T_getstatic_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 dxc.junit.opcodes.getstatic.jm;
-
-public class T_getstatic_9 {
-    
-    public int run(){
-        return -99;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/TestStubs.java
deleted file mode 100644
index 97c647f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/getstatic/jm/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 dxc.junit.opcodes.getstatic.jm;
-
-
-class StubInitError{
-    public static int value = 5 / 0;
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/Test_goto_w.java b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/Test_goto_w.java
deleted file mode 100644
index 4cac33d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/Test_goto_w.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 dxc.junit.opcodes.goto_w;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.goto_w.jm.T_goto_w_1;
-import dxc.junit.opcodes.goto_w.jm.T_goto_w_5;
-
-public class Test_goto_w extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_goto_w_1 t = new T_goto_w_1();
-        assertEquals(0, t.run(20));
-    }
-
-    /**
-     * @title normal test
-     */
-    public void testN2() {
-        T_goto_w_1 t = new T_goto_w_1();
-        assertEquals(-20, t.run(-20));
-    }
-
-    /**
-     * @title  negative offset
-     */
-    public void testN3() {
-        T_goto_w_5 t = new T_goto_w_5();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target is inside instruction
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.goto_w.jm.T_goto_w_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.goto_w.jm.T_goto_w_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.goto_w.jm.T_goto_w_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_1.j b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_1.j
deleted file mode 100644
index e7b623b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_1.j
+++ /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_goto_w_1.java
-.class public dxc/junit/opcodes/goto_w/jm/T_goto_w_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    goto_w Label0
-
-    Label1:
-    iinc 1 -1
-
-    Label0:
-    iload_1
-    ifgt Label1
-
-    iload_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_1.java b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_1.java
deleted file mode 100644
index d0a8e94..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_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 dxc.junit.opcodes.goto_w.jm;
-
-public class T_goto_w_1 {
-
-    public int run(int a) {
-        while (a > 0) {
-            a--;
-        }
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_2.cfh b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_2.cfh
deleted file mode 100644
index 4abb7c6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_2.cfh
+++ /dev/null
@@ -1,193 +0,0 @@
-//@class:dxc/junit/opcodes/goto_w/jm/T_goto_w_2
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000f
-// .  .  
-   00 0f 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 3, h: 0004: string{"a"}
-    // .  .  .  
-       08 00 0c 
-    // parsed:, offset 50, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 59, len 18, h: 0006: utf8{"T_goto_w_2.java"}
-    // .  .  .  T  _  g  o  t  o  _  w  _  2  .  j  a  v  a  
-       01 00 0f 54 5f 67 6f 74 6f 5f 77 5f 32 2e 6a 61 76 61 
-    // parsed:, offset 77, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 83, len 3, h: 0008: type{dxc.junit.opcodes.goto_w.jm.T_goto_w_2}
-    // .  .  .  
-       07 00 0e 
-    // parsed:, offset 86, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 91, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 98, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 104, len 4, h: 000c: utf8{"a"}
-    // .  .  .  a  
-       01 00 01 61 
-    // parsed:, offset 108, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 111, len 41, h: 000e: utf8{"dxc/junit/opcodes/goto_w/jm/T_goto_w_2"}
-    // .  .  &  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  g  o  t  o  _  w  /  j  m  /  T  _  g  o  t  o  _  w  _  2  
-       01 00 26 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 67 6f 74 6f 5f 77 2f 6a 6d 2f 54 5f 67 6f 74 6f 5f 77 5f 32 
-// parsed:, offset 152, len 0, h: end constant_pool
-// parsed:, offset 152, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 154, len 2, h: this_class: type{dxc.junit.opcodes.goto_w.jm.T_goto_w_2}
-// .  .  
-   00 08 
-// parsed:, offset 156, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 158, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 160, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 162, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 164, len:76,desc: ()V
-// parsed:, offset 164, len 0, h:  methods[0]: 
-    // parsed:, offset 164, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 168, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 170, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 172, len 0, h:  attributes[0]: 
-        // parsed:, offset 172, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 174, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 178, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 180, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 182, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 191, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 193, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 195, len 0, h: end attributes[0] 
-// parsed:, offset 195, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 195, len:45,desc: ()V
-// parsed:, offset 195, len 0, h:  methods[1]: 
-    // parsed:, offset 195, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 199, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 201, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 203, len 0, h:  attributes[0]: 
-        // parsed:, offset 203, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 205, len 4, h: length: 00000015
-        // .  .  .  .  
-           00 00 00 15 
-        // parsed:, offset 209, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 211, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 213, len 4, h: code_length: 00000009
-        // .  .  .  .  
-           00 00 00 09 
-        // parsed:, offset 0, len 5, h: 0000: goto_w 00000006
-        // .  .  .  .  .  
-//@mod:    c8 00 00 00 06 
-// we jump to the parameter of a byte code (was: ldc, now: string "a"), so this 
-// must be rejected by the verifier  
-           c8 00 00 00 07 
-        // parsed:, offset 5, len 1, h: 0005: return
-        // .  
-           b1 
-        // parsed:, offset 6, len 2, h: 0006: ldc string{"a"}
-        // .  .  
-           12 04 
-        // parsed:, offset 8, len 1, h: 0008: return
-        // .  
-           b1 
-        // parsed:, offset 226, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 228, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 230, len 0, h: end attributes[0] 
-// parsed:, offset 230, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 230, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 232, len 0, h:  attributes[0]: 
-    // parsed:, offset 232, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 234, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 238, len 2, h: source: utf8{"T_goto_w_2.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 240, len 0, h: end attributes[0] 
-// parsed:, offset 240, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_2.j b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_2.j
deleted file mode 100644
index d2c8771..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_2.j
+++ /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_goto_w_2.java
-.class public dxc/junit/opcodes/goto_w/jm/T_goto_w_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    goto_w Label0
-    return
-Label0:    
-    ldc "a"
-    return
-.end method
-
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_2.java b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_2.java
deleted file mode 100644
index 89e57ad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_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 dxc.junit.opcodes.goto_w.jm;
-
-public class T_goto_w_2 {
-
-    public void run() {
-        String a = "a";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_3.cfh b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_3.cfh
deleted file mode 100644
index 4a45a9c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_3.cfh
+++ /dev/null
@@ -1,191 +0,0 @@
-//@class:dxc/junit/opcodes/goto_w/jm/T_goto_w_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000f
-// .  .  
-   00 0f 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 3, h: 0004: string{"a"}
-    // .  .  .  
-       08 00 0c 
-    // parsed:, offset 50, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 59, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 65, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 70, len 3, h: 0008: type{dxc.junit.opcodes.goto_w.jm.T_goto_w_3}
-    // .  .  .  
-       07 00 0e 
-    // parsed:, offset 73, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 80, len 18, h: 000a: utf8{"T_goto_w_3.java"}
-    // .  .  .  T  _  g  o  t  o  _  w  _  3  .  j  a  v  a  
-       01 00 0f 54 5f 67 6f 74 6f 5f 77 5f 33 2e 6a 61 76 61 
-    // parsed:, offset 98, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 104, len 4, h: 000c: utf8{"a"}
-    // .  .  .  a  
-       01 00 01 61 
-    // parsed:, offset 108, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 111, len 41, h: 000e: utf8{"dxc/junit/opcodes/goto_w/jm/T_goto_w_3"}
-    // .  .  &  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  g  o  t  o  _  w  /  j  m  /  T  _  g  o  t  o  _  w  _  3  
-       01 00 26 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 67 6f 74 6f 5f 77 2f 6a 6d 2f 54 5f 67 6f 74 6f 5f 77 5f 33 
-// parsed:, offset 152, len 0, h: end constant_pool
-// parsed:, offset 152, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 154, len 2, h: this_class: type{dxc.junit.opcodes.goto_w.jm.T_goto_w_3}
-// .  .  
-   00 08 
-// parsed:, offset 156, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 158, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 160, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 162, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 164, len:76,desc: ()V
-// parsed:, offset 164, len 0, h:  methods[0]: 
-    // parsed:, offset 164, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 168, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 170, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 172, len 0, h:  attributes[0]: 
-        // parsed:, offset 172, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 174, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 178, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 180, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 182, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 191, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 193, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 195, len 0, h: end attributes[0] 
-// parsed:, offset 195, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 195, len:45,desc: ()V
-// parsed:, offset 195, len 0, h:  methods[1]: 
-    // parsed:, offset 195, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 199, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 201, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 203, len 0, h:  attributes[0]: 
-        // parsed:, offset 203, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 205, len 4, h: length: 00000015
-        // .  .  .  .  
-           00 00 00 15 
-        // parsed:, offset 209, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 211, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 213, len 4, h: code_length: 00000009
-        // .  .  .  .  
-           00 00 00 09 
-        // parsed:, offset 0, len 5, h: 0000: goto_w 00000006
-        // .  .  .  .  .  
-//@mod           c8 00 00 00 06 
-           c8 00 ff 00 06 
-        // parsed:, offset 5, len 1, h: 0005: return
-        // .  
-           b1 
-        // parsed:, offset 6, len 2, h: 0006: ldc string{"a"}
-        // .  .  
-           12 04 
-        // parsed:, offset 8, len 1, h: 0008: return
-        // .  
-           b1 
-        // parsed:, offset 226, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 228, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 230, len 0, h: end attributes[0] 
-// parsed:, offset 230, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 230, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 232, len 0, h:  attributes[0]: 
-    // parsed:, offset 232, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 234, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 238, len 2, h: source: utf8{"T_goto_w_3.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 240, len 0, h: end attributes[0] 
-// parsed:, offset 240, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_3.j b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_3.j
deleted file mode 100644
index 040e7ed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_3.j
+++ /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_goto_w_3.java
-.class public dxc/junit/opcodes/goto_w/jm/T_goto_w_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    goto_w Label0
-    return
-Label0:    
-    ldc "a"
-    return
-.end method
-
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_3.java b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_3.java
deleted file mode 100644
index a32670d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_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 dxc.junit.opcodes.goto_w.jm;
-
-public class T_goto_w_3 {
-
-    public void run() {
-        String a = "a";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_4.cfh
deleted file mode 100644
index e02cd46..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_4.cfh
+++ /dev/null
@@ -1,182 +0,0 @@
-//@class:dxc/junit/opcodes/goto_w/jm/T_goto_w_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0a 00 06 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 09 
-    // parsed:, offset 67, len 3, h: 0007: type{dxc.junit.opcodes.goto_w.jm.T_goto_w_4}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 70, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 77, len 6, h: 0009: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 83, len 3, h: 000a: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 86, len 41, h: 000b: utf8{"dxc/junit/opcodes/goto_w/jm/T_goto_w_4"}
-    // .  .  &  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  g  o  t  o  _  w  /  j  m  /  T  _  g  o  t  o  _  w  _  4  
-       01 00 26 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 67 6f 74 6f 5f 77 2f 6a 6d 2f 54 5f 67 6f 74 6f 5f 77 5f 34 
-    // parsed:, offset 127, len 18, h: 000c: utf8{"T_goto_w_4.java"}
-    // .  .  .  T  _  g  o  t  o  _  w  _  4  .  j  a  v  a  
-       01 00 0f 54 5f 67 6f 74 6f 5f 77 5f 34 2e 6a 61 76 61 
-// parsed:, offset 145, len 0, h: end constant_pool
-// parsed:, offset 145, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 147, len 2, h: this_class: type{dxc.junit.opcodes.goto_w.jm.T_goto_w_4}
-// .  .  
-   00 07 
-// parsed:, offset 149, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0a 
-// parsed:, offset 151, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 153, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 155, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 157, len:77,desc: ()V
-// parsed:, offset 157, len 0, h:  methods[0]: 
-    // parsed:, offset 157, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 159, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 161, len 2, h: descriptor: ()V
-    // .  .  
-       00 09 
-    // parsed:, offset 163, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 165, len 0, h:  attributes[0]: 
-        // parsed:, offset 165, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 167, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 171, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 173, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 175, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 184, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 186, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 188, len 0, h: end attributes[0] 
-// parsed:, offset 188, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 188, len:46,desc: ()V
-// parsed:, offset 188, len 0, h:  methods[1]: 
-    // parsed:, offset 188, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 190, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 192, len 2, h: descriptor: ()V
-    // .  .  
-       00 09 
-    // parsed:, offset 194, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 196, len 0, h:  attributes[0]: 
-        // parsed:, offset 196, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 198, len 4, h: length: 00000016
-        // .  .  .  .  
-           00 00 00 16 
-        // parsed:, offset 202, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 204, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 206, len 4, h: code_length: 0000000a
-        // .  .  .  .  
-           00 00 00 0a 
-        // parsed:, offset 0, len 5, h: 0000: goto_w 00000005
-        // .  .  .  .  .  
-//@mod           c8 00 00 00 05 
-           c8 00 00 00 06 
-        // parsed:, offset 5, len 4, h: 0005: wide aload 0000
-        // .  .  .  .  
-           c4 19 00 00 
-        // parsed:, offset 9, len 1, h: 0009: return
-        // .  
-           b1 
-        // parsed:, offset 220, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 222, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 224, len 0, h: end attributes[0] 
-// parsed:, offset 224, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 224, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 226, len 0, h:  attributes[0]: 
-    // parsed:, offset 226, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 228, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 232, len 2, h: source: utf8{"T_goto_w_4.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 234, len 0, h: end attributes[0] 
-// parsed:, offset 234, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_4.j b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_4.j
deleted file mode 100644
index 1c0b768..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_4.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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_w_4.java
-.class public dxc/junit/opcodes/goto_w/jm/T_goto_w_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    goto_w Label0
-Label0:    
-    aload_w 0
-    return
-.end method
-
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_4.java b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_4.java
deleted file mode 100644
index 3914675..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_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 dxc.junit.opcodes.goto_w.jm;
-
-public class T_goto_w_4 {
-
-    public void run() {
-        String a = "a";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_5.j b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_5.j
deleted file mode 100644
index 97309d9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_5.j
+++ /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_goto_w_5.java
-.class public dxc/junit/opcodes/goto_w/jm/T_goto_w_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    goto_w Label1
-Label0:
-    nop
-    nop
-    nop
-    iconst_1
-    ireturn
-Label1:    
-    goto_w Label0
-    iconst_0
-    ireturn
-.end method
-
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_5.java b/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_5.java
deleted file mode 100644
index 82daea8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/goto_w/jm/T_goto_w_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 dxc.junit.opcodes.goto_w.jm;
-
-public class T_goto_w_5 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/Test_i2b.java b/tools/dx-tests/src/dxc/junit/opcodes/i2b/Test_i2b.java
deleted file mode 100644
index 096b453..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/Test_i2b.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.i2b;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.i2b.jm.T_i2b_1;
-
-public class Test_i2b extends DxTestCase {
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN1() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(1, t.run(1));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN2() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(-1, t.run(-1));
-    }
-
-    /**
-     * @title  Argument = 16
-     */
-    public void testN3() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(16, t.run(16));
-    }
-
-    /**
-     * @title  Argument = -32
-     */
-    public void testN4() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(-32, t.run(-32));
-    }
-
-    /**
-     * @title  Argument = 134
-     */
-    public void testN5() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(-122, t.run(134));
-    }
-
-    /**
-     * @title  Argument = -134
-     */
-    public void testN6() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(122, t.run(-134));
-    }
-
-    /**
-     * @title s. Argument = 127
-     */
-    public void testB1() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(127, t.run(127));
-    }
-
-    /**
-     * @title s. Argument = 128
-     */
-    public void testB2() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(-128, t.run(128));
-    }
-
-    /**
-     * @title s. Argument = 0
-     */
-    public void testB3() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(0, t.run(0));
-    }
-
-    /**
-     * @title s. Argument = -128
-     */
-    public void testB4() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(-128, t.run(-128));
-    }
-
-    /**
-     * @title s. Argument = -129
-     */
-    public void testB5() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(127, t.run(-129));
-    }
-
-    /**
-     * @title s. Argument = Integer.MAX_VALUE
-     */
-    public void testB6() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(-1, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title s. Argument = Integer.MIN_VALUE
-     */
-    public void testB7() {
-        T_i2b_1 t = new T_i2b_1();
-        assertEquals(0, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2b.jm.T_i2b_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2b.jm.T_i2b_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2b.jm.T_i2b_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2b.jm.T_i2b_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_1.j b/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_1.j
deleted file mode 100644
index 6beef3b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_1.j
+++ /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 T_i2b_1.java
-.class public dxc/junit/opcodes/i2b/jm/T_i2b_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)B
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    i2b
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_1.java b/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_1.java
deleted file mode 100644
index ad3dd2b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_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 dxc.junit.opcodes.i2b.jm;
-
-public class T_i2b_1 {
-
-    public byte run(int a) {
-        return (byte) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_2.j b/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_2.j
deleted file mode 100644
index eb7c2c6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_2.j
+++ /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_i2b_2.java
-.class public dxc/junit/opcodes/i2b/jm/T_i2b_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)B
-    .limit stack 1
-    .limit locals 2
-    ; iload_1
-    i2b
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_2.java b/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_2.java
deleted file mode 100644
index 0a6f16f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_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 dxc.junit.opcodes.i2b.jm;
-
-public class T_i2b_2 {
-
-    public byte run(int a) {
-        return (byte) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_3.j b/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_3.j
deleted file mode 100644
index 3c2b8dd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_3.j
+++ /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 T_i2b_3.java
-.class public dxc/junit/opcodes/i2b/jm/T_i2b_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(D)B
-    .limit stack 2
-    .limit locals 3
-    dload_1
-    i2b
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_3.java b/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_3.java
deleted file mode 100644
index f16d916..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_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 dxc.junit.opcodes.i2b.jm;
-
-public class T_i2b_3 {
-
-    public byte run(double a) {
-        return (byte) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_4.j b/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_4.j
deleted file mode 100644
index 93653fa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_i2b_4.java
-.class public dxc/junit/opcodes/i2b/jm/T_i2b_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(J)B
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-    i2b
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_4.java b/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_4.java
deleted file mode 100644
index 10aa70d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_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 dxc.junit.opcodes.i2b.jm;
-
-public class T_i2b_4 {
-
-    public byte run(long a) {
-        return (byte) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_5.j b/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_5.j
deleted file mode 100644
index 85ee243..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_5.j
+++ /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_i2b_5.java
-.class public dxc/junit/opcodes/i2b/jm/T_i2b_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)B
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    i2b
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_5.java b/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_5.java
deleted file mode 100644
index a77b9c3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2b/jm/T_i2b_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 dxc.junit.opcodes.i2b.jm;
-
-public class T_i2b_5 {
-    
-    public byte run(int a) {
-        return (byte) a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/Test_i2c.java b/tools/dx-tests/src/dxc/junit/opcodes/i2c/Test_i2c.java
deleted file mode 100644
index c610a6c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/Test_i2c.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.i2c;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.i2c.jm.T_i2c_1;
-
-public class Test_i2c extends DxTestCase {
-
-    /**
-     * @title  Argument = 65
-     */
-    public void testN1() {
-        T_i2c_1 t = new T_i2c_1();
-        assertEquals('A', t.run(65));
-    }
-
-    /**
-     * @title  Argument = 65537
-     */
-    public void testN2() {
-        T_i2c_1 t = new T_i2c_1();
-        assertEquals('\u0001', t.run(65537));
-    }
-
-    /**
-     * @title  Argument = -2
-     */
-    public void testN3() {
-        T_i2c_1 t = new T_i2c_1();
-        assertEquals('\ufffe', t.run(-2));
-    }
-
-    /**
-     * @title  Argument = 0x110000
-     */
-    public void testN4() {
-        T_i2c_1 t = new T_i2c_1();
-        assertEquals('\u0000', t.run(0x110000));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testB1() {
-        T_i2c_1 t = new T_i2c_1();
-        assertEquals('\u0000', t.run(0));
-    }
-
-    /**
-     * @title  Argument = 65535
-     */
-    public void testB2() {
-        T_i2c_1 t = new T_i2c_1();
-        assertEquals('\uffff', t.run(65535));
-    }
-
-    /**
-     * @title  Argument = Integer.MAX_VALUE
-     */
-    public void testB3() {
-        T_i2c_1 t = new T_i2c_1();
-        assertEquals('\uffff', t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Integer.MIN_VALUE
-     */
-    public void testB4() {
-        T_i2c_1 t = new T_i2c_1();
-        assertEquals('\u0000', t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * verify test
-     */
-    /**
-     * @constraint 4.8.2
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2c.jm.T_i2c_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2c.jm.T_i2c_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2c.jm.T_i2c_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2c.jm.T_i2c_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_1.j b/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_1.j
deleted file mode 100644
index e15178d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_1.j
+++ /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 T_i2c_1.java
-.class public dxc/junit/opcodes/i2c/jm/T_i2c_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)C
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    i2c
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_1.java b/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_1.java
deleted file mode 100644
index a255f60..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_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 dxc.junit.opcodes.i2c.jm;
-
-public class T_i2c_1 {
-
-    public char run(int a) {
-        return (char) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_2.j b/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_2.j
deleted file mode 100644
index e6dcb12..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_i2c_2.java
-.class public dxc/junit/opcodes/i2c/jm/T_i2c_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)C
-    .limit stack 1
-    .limit locals 2
-    
-;    iload_1
-    i2c
-    
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_2.java b/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_2.java
deleted file mode 100644
index 6ee574c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_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 dxc.junit.opcodes.i2c.jm;
-
-public class T_i2c_2 {
-
-    public char run(int a) {
-        return (char) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_3.j b/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_3.j
deleted file mode 100644
index af0e098..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_3.j
+++ /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_i2c_3.java
-.class public dxc/junit/opcodes/i2c/jm/T_i2c_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(D)C
-    .limit stack 2
-    .limit locals 3
-
-    dload_1
-;    d2i
-    i2c
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_3.java b/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_3.java
deleted file mode 100644
index 12e7e70..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_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 dxc.junit.opcodes.i2c.jm;
-
-public class T_i2c_3 {
-
-    public char run(double a) {
-        return (char) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_4.j b/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_4.j
deleted file mode 100644
index 0ac4503..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_4.j
+++ /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_i2c_4.java
-.class public dxc/junit/opcodes/i2c/jm/T_i2c_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(J)C
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-;    l2i
-    i2c
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_4.java b/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_4.java
deleted file mode 100644
index 0583ce8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_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 dxc.junit.opcodes.i2c.jm;
-
-public class T_i2c_4 {
-
-    public char run(long a) {
-        return (char) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_5.j b/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_5.j
deleted file mode 100644
index 54e6ad3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_5.j
+++ /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_i2c_5.java
-.class public dxc/junit/opcodes/i2c/jm/T_i2c_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)C
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    i2c
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_5.java b/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_5.java
deleted file mode 100644
index a1d485d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2c/jm/T_i2c_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 dxc.junit.opcodes.i2c.jm;
-
-public class T_i2c_5 {
-    
-    public char run(int a) {
-        return (char) a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/Test_i2d.java b/tools/dx-tests/src/dxc/junit/opcodes/i2d/Test_i2d.java
deleted file mode 100644
index c6e57d3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/Test_i2d.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 dxc.junit.opcodes.i2d;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.i2d.jm.T_i2d_1;
-
-public class Test_i2d extends DxTestCase {
-
-    /**
-     * @title  Argument = 300000000
-     */
-    public void testN1() {
-        T_i2d_1 t = new T_i2d_1();
-        assertEquals(300000000d, t.run(300000000), 0d);
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_i2d_1 t = new T_i2d_1();
-        assertEquals(1d, t.run(1), 0d);
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_i2d_1 t = new T_i2d_1();
-        assertEquals(-1d, t.run(-1), 0d);
-    }
-
-
-    /**
-     * @title  Argument = Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_i2d_1 t = new T_i2d_1();
-        assertEquals(2147483647d, t.run(Integer.MAX_VALUE), 0d);
-    }
-
-    /**
-     * @title  Argument = Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_i2d_1 t = new T_i2d_1();
-        assertEquals(-2147483648d, t.run(Integer.MIN_VALUE), 0d);
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testB3() {
-        T_i2d_1 t = new T_i2d_1();
-        assertEquals(0d, t.run(0), 0d);
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2d.jm.T_i2d_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2d.jm.T_i2d_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2d.jm.T_i2d_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2d.jm.T_i2d_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2d.jm.T_i2d_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_1.j b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_1.j
deleted file mode 100644
index d44d272..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_1.j
+++ /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 T_i2d_1.java
-.class public dxc/junit/opcodes/i2d/jm/T_i2d_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)D
-    .limit stack 2
-    .limit locals 2
-    iload_1
-    i2d
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_1.java b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_1.java
deleted file mode 100644
index 0375f9d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_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 dxc.junit.opcodes.i2d.jm;
-
-public class T_i2d_1 {
-
-    public double run(int a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_2.j b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_2.j
deleted file mode 100644
index abd492b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_2.j
+++ /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_i2d_2.java
-.class public dxc/junit/opcodes/i2d/jm/T_i2d_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)D
-    .limit stack 2
-    .limit locals 2
-
-;    iload_1
-    i2d
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_2.java b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_2.java
deleted file mode 100644
index 0b2112d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_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 dxc.junit.opcodes.i2d.jm;
-
-public class T_i2d_2 {
-
-    public double run(int a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_3.j b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_3.j
deleted file mode 100644
index 7396e0c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_3.j
+++ /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_i2d_3.java
-.class public dxc/junit/opcodes/i2d/jm/T_i2d_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(F)D
-    .limit stack 2
-    .limit locals 2
-
-    fload_1
-;    f2i
-    i2d
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_3.java b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_3.java
deleted file mode 100644
index 39125cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_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 dxc.junit.opcodes.i2d.jm;
-
-public class T_i2d_3 {
-
-    public double run(float a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_4.j b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_4.j
deleted file mode 100644
index 041aa6c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_4.j
+++ /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_i2d_4.java
-.class public dxc/junit/opcodes/i2d/jm/T_i2d_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(J)D
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-;    l2i
-    i2d
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_4.java b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_4.java
deleted file mode 100644
index 7386ba9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_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 dxc.junit.opcodes.i2d.jm;
-
-public class T_i2d_4 {
-
-    public double run(long a) {
-        return (double) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_5.j b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_5.j
deleted file mode 100644
index e9ca3acb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_i2d_5.java
-.class public dxc/junit/opcodes/i2d/jm/T_i2d_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)D
-    .limit stack 1
-    .limit locals 2
-
-    iload_1
-    i2d
-    
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_5.java b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_5.java
deleted file mode 100644
index 5af85bd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_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 dxc.junit.opcodes.i2d.jm;
-
-public class T_i2d_5 {
-
-    public double run(int a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_6.j b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_6.j
deleted file mode 100644
index 00a7b78..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_6.j
+++ /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_i2d_6.java
-.class public dxc/junit/opcodes/i2d/jm/T_i2d_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)D
-    .limit stack 2
-    .limit locals 2
-
-    aload_0
-    i2d
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_6.java b/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_6.java
deleted file mode 100644
index a003add..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2d/jm/T_i2d_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 dxc.junit.opcodes.i2d.jm;
-
-public class T_i2d_6 {
-    
-    public double run(int a) {
-        return a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/Test_i2f.java b/tools/dx-tests/src/dxc/junit/opcodes/i2f/Test_i2f.java
deleted file mode 100644
index 4a5bcec..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/Test_i2f.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.i2f;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.i2f.jm.T_i2f_1;
-
-public class Test_i2f extends DxTestCase {
-
-    /**
-     * @title  Argument = 123456
-     */
-    public void testN1() {
-        T_i2f_1 t = new T_i2f_1();
-        assertEquals(123456f, t.run(123456), 0f);
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_i2f_1 t = new T_i2f_1();
-        assertEquals(1f, t.run(1), 0f);
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_i2f_1 t = new T_i2f_1();
-        assertEquals(-1f, t.run(-1), 0f);
-    }
-
-    /**
-     * @title  Argument = 33564439
-     */
-    public void testN4() {
-        T_i2f_1 t = new T_i2f_1();
-        assertEquals(3.356444E7f, t.run(33564439), 0f);
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testB1() {
-        T_i2f_1 t = new T_i2f_1();
-        assertEquals(0f, t.run(0), 0f);
-    }
-
-    /**
-     * @title  Argument = Argument = Integer.MAX_VALUE
-     */
-    public void testB2() {
-        T_i2f_1 t = new T_i2f_1();
-        assertEquals(2147483650f, t.run(Integer.MAX_VALUE), 0f);
-    }
-
-    /**
-     * @title  Argument = Integer.MIN_VALUE
-     */
-    public void testB3() {
-        T_i2f_1 t = new T_i2f_1();
-        assertEquals(-2147483650f, t.run(Integer.MIN_VALUE), 0f);
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2f.jm.T_i2f_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2f.jm.T_i2f_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2f.jm.T_i2f_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2f.jm.T_i2f_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_1.j b/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_1.j
deleted file mode 100644
index e77cc6d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_1.j
+++ /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 T_i2f_1.java
-.class public dxc/junit/opcodes/i2f/jm/T_i2f_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)F
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    i2f
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_1.java b/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_1.java
deleted file mode 100644
index e985e19..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_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 dxc.junit.opcodes.i2f.jm;
-
-public class T_i2f_1 {
-
-    public float run(int a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_2.j b/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_2.j
deleted file mode 100644
index f1e729f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_2.j
+++ /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_i2f_2.java
-.class public dxc/junit/opcodes/i2f/jm/T_i2f_2
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)F
-    .limit stack 1
-    .limit locals 2
-
-;    iload_1
-    i2f
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_2.java b/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_2.java
deleted file mode 100644
index ae113ed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_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 dxc.junit.opcodes.i2f.jm;
-
-public class T_i2f_2 {
-
-    public float run(int a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_3.j b/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_3.j
deleted file mode 100644
index fac0ac4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_3.j
+++ /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_i2f_3.java
-.class public dxc/junit/opcodes/i2f/jm/T_i2f_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(D)F
-    .limit stack 2
-    .limit locals 3
-
-    dload_1
-;    d2i
-    i2f
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_3.java b/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_3.java
deleted file mode 100644
index a4f1727..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_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 dxc.junit.opcodes.i2f.jm;
-
-public class T_i2f_3 {
-
-    public float run(double a) {
-        return (float)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_4.j b/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_4.j
deleted file mode 100644
index 3194274..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_4.j
+++ /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_i2f_4.java
-.class public dxc/junit/opcodes/i2f/jm/T_i2f_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(J)F
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-    ;l2i
-    i2f
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_4.java b/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_4.java
deleted file mode 100644
index 5aad4ad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_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 dxc.junit.opcodes.i2f.jm;
-
-public class T_i2f_4 {
-
-    public float run(long a) {
-        return (float) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_5.j b/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_5.j
deleted file mode 100644
index 9dfed0c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_5.j
+++ /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_i2f_5.java
-.class public dxc/junit/opcodes/i2f/jm/T_i2f_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)F
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    i2f
-    freturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_5.java b/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_5.java
deleted file mode 100644
index fcbe7e2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2f/jm/T_i2f_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 dxc.junit.opcodes.i2f.jm;
-
-public class T_i2f_5 {
-    
-    public float run(int a) {
-        return a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/Test_i2l.java b/tools/dx-tests/src/dxc/junit/opcodes/i2l/Test_i2l.java
deleted file mode 100644
index 8bd6a89..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/Test_i2l.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.i2l;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.i2l.jm.T_i2l_1;
-
-public class Test_i2l extends DxTestCase {
-
-    /**
-     * @title Argument = 123456
-     */
-    public void testN1() {
-        T_i2l_1 t = new T_i2l_1();
-        assertEquals(123456l, t.run(123456));
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_i2l_1 t = new T_i2l_1();
-        assertEquals(1l, t.run(1));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_i2l_1 t = new T_i2l_1();
-        assertEquals(-1l, t.run(-1));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testB1() {
-        T_i2l_1 t = new T_i2l_1();
-        assertEquals(0l, t.run(0));
-    }
-
-    /**
-     * @title  Argument = Integer.MAX_VALUE
-     */
-    public void testB2() {
-        T_i2l_1 t = new T_i2l_1();
-        assertEquals(2147483647l, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Integer.MIN_VALUE
-     */
-    public void testB3() {
-        T_i2l_1 t = new T_i2l_1();
-        assertEquals(-2147483648l, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2l.jm.T_i2l_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2l.jm.T_i2l_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2l.jm.T_i2l_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2l.jm.T_i2l_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2l.jm.T_i2l_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_1.j b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_1.j
deleted file mode 100644
index 49660c4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_1.j
+++ /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 T_i2l_1.java
-.class public dxc/junit/opcodes/i2l/jm/T_i2l_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)J
-    .limit stack 2
-    .limit locals 2
-    iload_1
-    i2l
-    lreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_1.java b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_1.java
deleted file mode 100644
index 5b03ca0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_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 dxc.junit.opcodes.i2l.jm;
-
-public class T_i2l_1 {
-
-    public long run(int a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_2.j b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_2.j
deleted file mode 100644
index 0435fb4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_2.j
+++ /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_i2l_2.java
-.class public dxc/junit/opcodes/i2l/jm/T_i2l_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)J
-    .limit stack 2
-    .limit locals 2
-
-;    iload_1
-    i2l
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_2.java b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_2.java
deleted file mode 100644
index 4209cad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_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 dxc.junit.opcodes.i2l.jm;
-
-public class T_i2l_2 {
-
-    public long run(int a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_3.j b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_3.j
deleted file mode 100644
index ed8c96a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_3.j
+++ /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_i2l_3.java
-.class public dxc/junit/opcodes/i2l/jm/T_i2l_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(D)J
-    .limit stack 2
-    .limit locals 3
- 
-    dload_1
- ;   d2i
-     i2l
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_3.java b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_3.java
deleted file mode 100644
index c8b8704..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_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 dxc.junit.opcodes.i2l.jm;
-
-public class T_i2l_3 {
-
-    public long run(double a) {
-        return (long)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_4.j b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_4.j
deleted file mode 100644
index a172ce4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_4.j
+++ /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_i2l_4.java
-.class public dxc/junit/opcodes/i2l/jm/T_i2l_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(J)J
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-
-    i2l
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_4.java b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_4.java
deleted file mode 100644
index cc27bc2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_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 dxc.junit.opcodes.i2l.jm;
-
-public class T_i2l_4 {
-
-    public long run(long a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_5.j b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_5.j
deleted file mode 100644
index 8dcd481..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_i2l_5.java
-.class public dxc/junit/opcodes/i2l/jm/T_i2l_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)J
-    .limit stack 1
-    .limit locals 2
-
-    iload_1
-    i2l
-
-    lreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_5.java b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_5.java
deleted file mode 100644
index 407650d5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_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 dxc.junit.opcodes.i2l.jm;
-
-public class T_i2l_5 {
-
-    public long run(int a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_6.j b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_6.j
deleted file mode 100644
index 75c9693..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_6.j
+++ /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_i2l_6.java
-.class public dxc/junit/opcodes/i2l/jm/T_i2l_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)J
-    .limit stack 2
-    .limit locals 2
-
-    aload_0
-    i2l
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_6.java b/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_6.java
deleted file mode 100644
index 9f2d674..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2l/jm/T_i2l_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 dxc.junit.opcodes.i2l.jm;
-
-public class T_i2l_6 {
-    
-    public long run(int a) {
-        return a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/Test_i2s.java b/tools/dx-tests/src/dxc/junit/opcodes/i2s/Test_i2s.java
deleted file mode 100644
index f0ae1f2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/Test_i2s.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 dxc.junit.opcodes.i2s;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.i2s.jm.T_i2s_1;
-
-public class Test_i2s extends DxTestCase {
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN1() {
-        T_i2s_1 t = new T_i2s_1();
-        assertEquals(1, t.run(1));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN2() {
-        T_i2s_1 t = new T_i2s_1();
-        assertEquals(-1, t.run(-1));
-    }
-
-    /**
-     * @title  Argument = 32767
-     */
-    public void testN3() {
-        T_i2s_1 t = new T_i2s_1();
-        assertEquals(32767, t.run(32767));
-    }
-
-    /**
-     * @title  Argument = -32768
-     */
-    public void testN4() {
-        T_i2s_1 t = new T_i2s_1();
-        assertEquals(-32768, t.run(-32768));
-    }
-
-    /**
-     * @title  Argument = -32769
-     */
-    public void testN5() {
-        T_i2s_1 t = new T_i2s_1();
-        assertEquals(32767, t.run(-32769));
-    }
-
-    /**
-     * @title  Argument = 32768
-     */
-    public void testN6() {
-        T_i2s_1 t = new T_i2s_1();
-        assertEquals(-32768, t.run(32768));
-    }
-
-    /**
-     * @title  Argument = 0x10fedc;
-     */
-    public void testN7() {
-        T_i2s_1 t = new T_i2s_1();
-        assertEquals(0xfffffedc, t.run(0x10fedc));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testB1() {
-        T_i2s_1 t = new T_i2s_1();
-        assertEquals(0, t.run(0));
-    }
-
-    /**
-     * @title  Argument = Integer.MAX_VALUE
-     */
-    public void testB2() {
-        T_i2s_1 t = new T_i2s_1();
-        assertEquals(-1, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Integer.MIN_VALUE
-     */
-    public void testB3() {
-        T_i2s_1 t = new T_i2s_1();
-        assertEquals(0, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2s.jm.T_i2s_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2s.jm.T_i2s_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2s.jm.T_i2s_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.i2s.jm.T_i2s_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_1.j b/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_1.j
deleted file mode 100644
index 2224057..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_1.j
+++ /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 T_i2s_1.java
-.class public dxc/junit/opcodes/i2s/jm/T_i2s_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)S
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    i2s
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_1.java b/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_1.java
deleted file mode 100644
index f01646d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_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 dxc.junit.opcodes.i2s.jm;
-
-public class T_i2s_1 {
-
-    public short run(int a) {
-        return (short)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_2.j b/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_2.j
deleted file mode 100644
index c62c56f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_2.j
+++ /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_i2s_2.java
-.class public dxc/junit/opcodes/i2s/jm/T_i2s_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)S
-    .limit stack 1
-    .limit locals 2
-
-;    iload_1
-    i2s
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_2.java b/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_2.java
deleted file mode 100644
index 73e3134..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_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 dxc.junit.opcodes.i2s.jm;
-
-public class T_i2s_2 {
-
-    public short run(int a) {
-        return (short)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_3.j b/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_3.j
deleted file mode 100644
index 05b14f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_i2s_3.java
-.class public dxc/junit/opcodes/i2s/jm/T_i2s_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(D)S
-    .limit stack 2
-    .limit locals 3
- 
-    dload_1
-;    d2i
-    i2s
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_3.java b/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_3.java
deleted file mode 100644
index 92d6144..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_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 dxc.junit.opcodes.i2s.jm;
-
-public class T_i2s_3 {
-
-    public short run(double a) {
-        return (short)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_4.j b/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_4.j
deleted file mode 100644
index 927254c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_i2s_4.java
-.class public dxc/junit/opcodes/i2s/jm/T_i2s_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(J)S
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-;    l2i
-    i2s
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_4.java b/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_4.java
deleted file mode 100644
index 703e103..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_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 dxc.junit.opcodes.i2s.jm;
-
-public class T_i2s_4 {
-
-    public short run(long a) {
-        return (short)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_5.j b/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_5.j
deleted file mode 100644
index 6ee161e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_5.j
+++ /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_i2s_5.java
-.class public dxc/junit/opcodes/i2s/jm/T_i2s_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)S
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    i2s
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_5.java b/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_5.java
deleted file mode 100644
index 85dde1d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/i2s/jm/T_i2s_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 dxc.junit.opcodes.i2s.jm;
-
-public class T_i2s_5 {
-    
-    public short run(int a) {
-        return (short)a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/Test_iadd.java b/tools/dx-tests/src/dxc/junit/opcodes/iadd/Test_iadd.java
deleted file mode 100644
index 4e65023..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/Test_iadd.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 dxc.junit.opcodes.iadd;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iadd.jm.T_iadd_1;
-
-public class Test_iadd extends DxTestCase {
-
-    /**
-     * @title Arguments = 8, 4
-     */
-    public void testN1() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(12, t.run(8, 4));
-    }
-
-    /**
-     * @title Arguments = 0, 255
-     */
-    public void testN2() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(255, t.run(0, 255));
-    }
-
-    /**
-     * @title Arguments = 0, -65536
-     */
-    public void testN3() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(-65536, t.run(0, -65536));
-    }
-
-    /**
-     * @title Arguments = 0, -2147483647
-     */
-    public void testN4() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(-2147483647, t.run(0, -2147483647));
-    }
-
-    /**
-     * @title Arguments = 0x7ffffffe, 2
-     */
-    public void testN5() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(-2147483648, t.run(0x7ffffffe, 2));
-    }
-
-    /**
-     * @title Arguments = -1, 1
-     */
-    public void testN6() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(0, t.run(-1, 1));
-    }
-
-    /**
-     * @title Arguments = 0, Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(Integer.MAX_VALUE, t.run(0, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
-     */
-    public void testB2() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(-2, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title Arguments = Integer.MAX_VALUE, 1
-     */
-    public void testB3() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title Arguments = Integer.MIN_VALUE, 1
-     */
-    public void testB4() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(-2147483647, t.run(Integer.MIN_VALUE, 1));
-    }
-
-    /**
-     * @title Arguments = 0, 0
-     */
-    public void testB5() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(0, t.run(0, 0));
-    }
-
-    /**
-     * @title Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
-     */
-    public void testB6() {
-        T_iadd_1 t = new T_iadd_1();
-        assertEquals(0, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iadd.jm.T_iadd_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iadd.jm.T_iadd_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iadd.jm.T_iadd_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iadd.jm.T_iadd_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_1.j
deleted file mode 100644
index 7d5ab14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iadd_1.java
-.class public dxc/junit/opcodes/iadd/jm/T_iadd_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    iadd
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_1.java
deleted file mode 100644
index 63e35c9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_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 dxc.junit.opcodes.iadd.jm;
-
-public class T_iadd_1 {
-
-    public int run(int a, int b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_2.j
deleted file mode 100644
index 4000167..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iadd_2.java
-.class public dxc/junit/opcodes/iadd/jm/T_iadd_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    ; iload_2    
-    iadd
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_2.java
deleted file mode 100644
index 249c9de..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_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 dxc.junit.opcodes.iadd.jm;
-
-public class T_iadd_2 {
-
-    public int run(int a, int b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_3.j
deleted file mode 100644
index 61a788f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iadd_3.java
-.class public dxc/junit/opcodes/iadd/jm/T_iadd_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(ID)I
-    .limit stack 3
-    .limit locals 5
-    iload_1
-    dload_2    
-    iadd
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_3.java
deleted file mode 100644
index 98ac780..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_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 dxc.junit.opcodes.iadd.jm;
-
-public class T_iadd_3 {
-
-    public int run(int a, double b) {
-        return a+(int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_4.j
deleted file mode 100644
index b80dbca..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_4.j
+++ /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_iadd_4.java
-.class public dxc/junit/opcodes/iadd/jm/T_iadd_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JI)I
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-;    l2i
-    iload_3
-    iadd
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_4.java
deleted file mode 100644
index cb97c39..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_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 dxc.junit.opcodes.iadd.jm;
-
-public class T_iadd_4 {
-
-    public int run(long a, int b) {
-        return (int)a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_5.j
deleted file mode 100644
index e815ee4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iadd_5.java
-.class public dxc/junit/opcodes/iadd/jm/T_iadd_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    iadd
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_5.java
deleted file mode 100644
index 6d05810..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iadd/jm/T_iadd_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 dxc.junit.opcodes.iadd.jm;
-
-public class T_iadd_5 {
-    
-    public int run(int a, int b) {
-        return a+b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/Test_iaload.java b/tools/dx-tests/src/dxc/junit/opcodes/iaload/Test_iaload.java
deleted file mode 100644
index 0b37ac2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/Test_iaload.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 dxc.junit.opcodes.iaload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iaload.jm.T_iaload_1;
-
-public class Test_iaload extends DxTestCase {
-
-    /**
-     * @title Normal test/. Trying different indexes
-     */
-    public void testN1() {
-        T_iaload_1 t = new T_iaload_1();
-        int[] arr = new int[2];
-        arr[1] = 100000000;
-        assertEquals(100000000, t.run(arr, 1));
-    }
-
-    /**
-     * @title Normal test/. Trying different indexes
-     */
-    public void testN2() {
-        T_iaload_1 t = new T_iaload_1();
-        int[] arr = new int[2];
-        arr[0] = 100000000;
-        assertEquals(100000000, t.run(arr, 0));
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_iaload_1 t = new T_iaload_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_iaload_1 t = new T_iaload_1();
-        try {
-            t.run(null, 2);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_iaload_1 t = new T_iaload_1();
-        int[] arr = new int[2];
-        try {
-            t.run(arr, -1);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iaload.jm.T_iaload_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iaload.jm.T_iaload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iaload.jm.T_iaload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iaload.jm.T_iaload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - Object, int
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.iaload.jm.T_iaload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.iaload.jm.T_iaload_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.iaload.jm.T_iaload_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.iaload.jm.T_iaload_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_1.j
deleted file mode 100644
index 097f974..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_1.j
+++ /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_iaload_1.java
-.class public dxc/junit/opcodes/iaload/jm/T_iaload_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([II)I
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-
-    iaload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_1.java
deleted file mode 100644
index 06baef4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_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 dxc.junit.opcodes.iaload.jm;
-
-public class T_iaload_1 {
-    public int run(int[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_2.j
deleted file mode 100644
index 949cf4c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_2.j
+++ /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_iaload_2.java
-.class public dxc/junit/opcodes/iaload/jm/T_iaload_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([II)I
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-;    iload_2
-
-    iaload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_2.java
deleted file mode 100644
index dda4c99..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_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 dxc.junit.opcodes.iaload.jm;
-
-public class T_iaload_2 {
-
-    public int run(int[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_3.j
deleted file mode 100644
index f54bde1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iaload_3.java
-.class public dxc/junit/opcodes/iaload/jm/T_iaload_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([II)I
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    iaload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_3.java
deleted file mode 100644
index 3ce0959..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_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 dxc.junit.opcodes.iaload.jm;
-
-public class T_iaload_3 {
-
-    public int run(int[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_4.j
deleted file mode 100644
index fd6243c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_4.j
+++ /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_iaload_4.java
-.class public dxc/junit/opcodes/iaload/jm/T_iaload_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([ID)I
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-;    d2i
-    iaload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_4.java
deleted file mode 100644
index 376f303..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_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 dxc.junit.opcodes.iaload.jm;
-
-public class T_iaload_4 {
-
-    public int run(int[] arr, double idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_5.j
deleted file mode 100644
index b29eeae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_5.j
+++ /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_iaload_5.java
-.class public dxc/junit/opcodes/iaload/jm/T_iaload_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([IJ)I
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    lload_2
-;    l2i
-    iaload
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_5.java
deleted file mode 100644
index a1e260b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_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 dxc.junit.opcodes.iaload.jm;
-
-public class T_iaload_5 {
-
-    public int run(int[] arr, long idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_6.j
deleted file mode 100644
index dd84023..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_6.j
+++ /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_iaload_6.java
-.class public dxc/junit/opcodes/iaload/jm/T_iaload_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;[II)I
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_3
-
-    iaload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_6.java
deleted file mode 100644
index b371b7b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_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 dxc.junit.opcodes.iaload.jm;
-
-public class T_iaload_6 {
-
-    public int run(Object a, int[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_7.j b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_7.j
deleted file mode 100644
index 5989d3c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iaload_7.java
-.class public dxc/junit/opcodes/iaload/jm/T_iaload_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([D[II)I
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    iaload
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_7.java b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_7.java
deleted file mode 100644
index a6ab6ed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_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 dxc.junit.opcodes.iaload.jm;
-
-public class T_iaload_7 {
-
-    public int run(double[] a, int[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_8.j b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_8.j
deleted file mode 100644
index 3b83df4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_8.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iaload_8.java
-.class public dxc/junit/opcodes/iaload/jm/T_iaload_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([J[II)I
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    iaload
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_8.java b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_8.java
deleted file mode 100644
index 7fc1fd4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_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 dxc.junit.opcodes.iaload.jm;
-
-public class T_iaload_8 {
-
-    public int run(long[] a, int[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_9.j b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_9.j
deleted file mode 100644
index 73c8718..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_9.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iaload_9.java
-.class public dxc/junit/opcodes/iaload/jm/T_iaload_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    aload_0
-    iaload
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_9.java b/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_9.java
deleted file mode 100644
index 3ac4522..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iaload/jm/T_iaload_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 dxc.junit.opcodes.iaload.jm;
-
-public class T_iaload_9 {
-    
-    public int run(int[] arr, int idx) {
-        return arr[idx];
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/Test_iand.java b/tools/dx-tests/src/dxc/junit/opcodes/iand/Test_iand.java
deleted file mode 100644
index 3ffc871..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/Test_iand.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 dxc.junit.opcodes.iand;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iand.jm.T_iand_1;
-
-public class Test_iand extends DxTestCase {
-
-    /**
-     * @title Arguments = 15, 8
-     */
-    public void testN1() {
-        T_iand_1 t = new T_iand_1();
-        assertEquals(8, t.run(15, 8));
-    }
-
-    /**
-     * @title Arguments = 0xfffffff8, 0xfffffff1
-     */
-    public void testN2() {
-        T_iand_1 t = new T_iand_1();
-        assertEquals(0xfffffff0, t.run(0xfffffff8, 0xfffffff1));
-    }
-
-    /**
-     * @title  Arguments = 0xcafe & -1
-     */
-    public void testN3() {
-        T_iand_1 t = new T_iand_1();
-        assertEquals(0xcafe, t.run(0xcafe, -1));
-    }
-
-    /**
-     * @title  Arguments = 0 & -1
-     */
-    public void testB1() {
-        T_iand_1 t = new T_iand_1();
-        assertEquals(0, t.run(0, -1));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE & Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_iand_1 t = new T_iand_1();
-        assertEquals(0, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iand.jm.T_iand_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iand.jm.T_iand_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long & int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iand.jm.T_iand_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int & reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iand.jm.T_iand_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_1.j
deleted file mode 100644
index 8a1bd03..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iand_1.java
-.class public dxc/junit/opcodes/iand/jm/T_iand_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    iand
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_1.java
deleted file mode 100644
index e0783a5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_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 dxc.junit.opcodes.iand.jm;
-
-public class T_iand_1 {
-
-    public int run(int a, int b) {
-        return a & b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_2.j
deleted file mode 100644
index 44323a9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iand_2.java
-.class public dxc/junit/opcodes/iand/jm/T_iand_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-;    iload_2
-    iand
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_2.java
deleted file mode 100644
index 6eef083..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_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 dxc.junit.opcodes.iand.jm;
-
-public class T_iand_2 {
-
-    public int run(int a, int b) {
-        return a & b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_3.j
deleted file mode 100644
index f5ea270..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_3.j
+++ /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_iand_3.java
-.class public dxc/junit/opcodes/iand/jm/T_iand_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DI)I
-    .limit stack 3
-    .limit locals 4
-
-    dload_1
-;    d2i
-    iload_3
-    iand
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_3.java
deleted file mode 100644
index c87a78f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_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 dxc.junit.opcodes.iand.jm;
-
-public class T_iand_3 {
-
-    public int run(double a, int b) {
-        return (int)a & b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_4.j
deleted file mode 100644
index c849643..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_4.j
+++ /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_iand_4.java
-.class public dxc/junit/opcodes/iand/jm/T_iand_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(IJ)I
-    .limit stack 3
-    .limit locals 4
-
-    iload_1
-    lload_2
-;    l2i
-    iand
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_4.java
deleted file mode 100644
index bbfe63d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_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 dxc.junit.opcodes.iand.jm;
-
-public class T_iand_4 {
-
-    public int run(int a, long b) {
-        return a & (int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_5.j
deleted file mode 100644
index daa5908..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iand_5.java
-.class public dxc/junit/opcodes/iand/jm/T_iand_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    aload_0
-    iand
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_5.java
deleted file mode 100644
index 177c707..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iand/jm/T_iand_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 dxc.junit.opcodes.iand.jm;
-
-public class T_iand_5 {
-    
-    public int run(int a, int b) {
-        return a & b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/Test_iastore.java b/tools/dx-tests/src/dxc/junit/opcodes/iastore/Test_iastore.java
deleted file mode 100644
index 539e8ae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/Test_iastore.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 dxc.junit.opcodes.iastore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iastore.jm.T_iastore_1;
-
-public class Test_iastore extends DxTestCase {
-
-    /**
-     * @title Normal test/. Trying different indexes
-     */
-    public void testN1() {
-        T_iastore_1 t = new T_iastore_1();
-        int[] arr = new int[2];
-        t.run(arr, 1, 100000000);
-        assertEquals(100000000, arr[1]);
-    }
-
-    /**
-     * @title Normal test/. Trying different indexes
-     */
-    public void testN2() {
-        T_iastore_1 t = new T_iastore_1();
-        int[] arr = new int[2];
-        t.run(arr, 0, 100000000);
-        assertEquals(100000000, arr[0]);
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_iastore_1 t = new T_iastore_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_iastore_1 t = new T_iastore_1();
-        try {
-            t.run(null, 2, 100000000);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_iastore_1 t = new T_iastore_1();
-        int[] arr = new int[2];
-        try {
-            t.run(arr, -1, 100000000);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iastore.jm.T_iastore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iastore.jm.T_iastore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double,
-     * int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iastore.jm.T_iastore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, int, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iastore.jm.T_iastore_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - object, int, int
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.iastore.jm.T_iastore_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], int,
-     * int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.iastore.jm.T_iastore_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int, int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.iastore.jm.T_iastore_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference,
-     * long
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.iastore.jm.T_iastore_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_1.j
deleted file mode 100644
index 8a2c771..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_1.j
+++ /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_iastore_1.java
-.class public dxc/junit/opcodes/iastore/jm/T_iastore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([III)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    iload_3
-    iastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_1.java
deleted file mode 100644
index 253e9d3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_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 dxc.junit.opcodes.iastore.jm;
-
-public class T_iastore_1 {
-    public void run(int[] arr, int idx, int value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_2.j
deleted file mode 100644
index 7c34197..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_2.j
+++ /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_iastore_2.java
-.class public dxc/junit/opcodes/iastore/jm/T_iastore_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([III)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    ;iload_3
-    iastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_2.java
deleted file mode 100644
index f407f92..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_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 dxc.junit.opcodes.iastore.jm;
-
-public class T_iastore_2 {
-
-    public void run(int[] arr, int idx, int value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_3.j
deleted file mode 100644
index cb6cfb5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_3.j
+++ /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_iastore_3.java
-.class public dxc/junit/opcodes/iastore/jm/T_iastore_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([III)V
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    iload_3
-    iastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_3.java
deleted file mode 100644
index 0df3ee9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_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 dxc.junit.opcodes.iastore.jm;
-
-public class T_iastore_3 {
-
-    public void run(int[] arr, int idx, int value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_4.j
deleted file mode 100644
index 0fa6d09..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_4.j
+++ /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_iastore_4.java
-.class public dxc/junit/opcodes/iastore/jm/T_iastore_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([IDI)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-;    d2i
-    iload 4
-
-    iastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_4.java
deleted file mode 100644
index 0706835..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_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 dxc.junit.opcodes.iastore.jm;
-
-public class T_iastore_4 {
-
-    public void run(int[] arr, double idx, int value) {
-        arr[(int)idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_5.j
deleted file mode 100644
index 59f0399..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_5.j
+++ /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_iastore_5.java
-.class public dxc/junit/opcodes/iastore/jm/T_iastore_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([IIJ)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    iload_2
-    lload_3
-;    l2i
-    iastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_5.java
deleted file mode 100644
index 989da2f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_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 dxc.junit.opcodes.iastore.jm;
-
-public class T_iastore_5 {
-
-    public void run(int[] arr, int idx, long value) {
-        arr[idx] = (int)value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_6.j b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_6.j
deleted file mode 100644
index f3d75dc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_6.j
+++ /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_iastore_6.java
-.class public dxc/junit/opcodes/iastore/jm/T_iastore_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;II)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    iload_3
-    iastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_6.java b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_6.java
deleted file mode 100644
index 0f5ea3e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_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 dxc.junit.opcodes.iastore.jm;
-
-public class T_iastore_6 {
-
-    public void run(Object a, int[] arr, int idx, int value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_7.j b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_7.j
deleted file mode 100644
index 5ee1b4d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_7.j
+++ /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_iastore_7.java
-.class public dxc/junit/opcodes/iastore/jm/T_iastore_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([D[III)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_3
-    iload 4
-    iastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_7.java b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_7.java
deleted file mode 100644
index 22b4348..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_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 dxc.junit.opcodes.iastore.jm;
-
-public class T_iastore_7 {
-
-    public void run(double a[], int[] arr, int idx, int value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_8.j b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_8.j
deleted file mode 100644
index 1de1c74..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_8.j
+++ /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_iastore_8.java
-.class public dxc/junit/opcodes/iastore/jm/T_iastore_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([J[III)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_3
-    iload 4
-    iastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_8.java b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_8.java
deleted file mode 100644
index 5493e4d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_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 dxc.junit.opcodes.iastore.jm;
-
-public class T_iastore_8 {
-
-    public void run(long a[], int[] arr, int idx, int value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_9.j b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_9.j
deleted file mode 100644
index a0b993b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iastore_9.java
-.class public dxc/junit/opcodes/iastore/jm/T_iastore_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([III)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    aload_0
-    iload_3
-    iastore
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_9.java b/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_9.java
deleted file mode 100644
index 8b30629..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iastore/jm/T_iastore_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 dxc.junit.opcodes.iastore.jm;
-
-public class T_iastore_9 {
-    
-    public void run(int[] arr, int idx, int value) {
-        arr[idx] = value;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/Test_iconst_0.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/Test_iconst_0.java
deleted file mode 100644
index d394385..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/Test_iconst_0.java
+++ /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.
- */
-
-package dxc.junit.opcodes.iconst_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iconst_0.jm.T_iconst_0_1;
-
-public class Test_iconst_0 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_iconst_0_1 t = new T_iconst_0_1();
-        int b = 1234;
-        int c = 1234;
-        int d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iconst_0.jm.T_iconst_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_1.j
deleted file mode 100644
index 9510066..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_1.j
+++ /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_iconst_0_1.java
-.class public dxc/junit/opcodes/iconst_0/jm/T_iconst_0_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_1.java
deleted file mode 100644
index 112b6d5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_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 dxc.junit.opcodes.iconst_0.jm;
-
-public class T_iconst_0_1 {
-
-    public int run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_2.j
deleted file mode 100644
index 90d93a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_2.j
+++ /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_iconst_0_2.java
-.class public dxc/junit/opcodes/iconst_0/jm/T_iconst_0_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-;    .limit locals 1
-
-    iconst_0
-    iconst_0
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_2.java
deleted file mode 100644
index 9f40962..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_0/jm/T_iconst_0_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 dxc.junit.opcodes.iconst_0.jm;
-
-public class T_iconst_0_2 {
-
-    public int run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/Test_iconst_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/Test_iconst_1.java
deleted file mode 100644
index 2ceda6d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/Test_iconst_1.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 dxc.junit.opcodes.iconst_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iconst_1.jm.T_iconst_1_1;
-
-public class Test_iconst_1 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_iconst_1_1 t = new T_iconst_1_1();
-        int b = 1235;
-        int c = 1234;
-        int d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iconst_1.jm.T_iconst_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_1.j
deleted file mode 100644
index b7c4558..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_1.j
+++ /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_iconst_1_1.java
-.class public dxc/junit/opcodes/iconst_1/jm/T_iconst_1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_1.java
deleted file mode 100644
index 963428c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_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 dxc.junit.opcodes.iconst_1.jm;
-
-public class T_iconst_1_1 {
-
-    public int run() {
-        return 1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_2.j
deleted file mode 100644
index 10f3e61..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_2.j
+++ /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_iconst_1_2.java
-.class public dxc/junit/opcodes/iconst_1/jm/T_iconst_1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-;    .limit locals 1
- 
-    iconst_1
-    iconst_1
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_2.java
deleted file mode 100644
index c2f95f1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_1/jm/T_iconst_1_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 dxc.junit.opcodes.iconst_1.jm;
-
-public class T_iconst_1_2 {
-
-    public int run() {
-        return 1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/Test_iconst_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/Test_iconst_2.java
deleted file mode 100644
index fc3b558..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/Test_iconst_2.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 dxc.junit.opcodes.iconst_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iconst_2.jm.T_iconst_2_1;
-
-public class Test_iconst_2 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_iconst_2_1 t = new T_iconst_2_1();
-        int b = 1236;
-        int c = 1234;
-        int d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iconst_2.jm.T_iconst_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_1.j
deleted file mode 100644
index 582564e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_1.j
+++ /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_iconst_2_1.java
-.class public dxc/junit/opcodes/iconst_2/jm/T_iconst_2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    iconst_2
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_1.java
deleted file mode 100644
index 7a00ed3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_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 dxc.junit.opcodes.iconst_2.jm;
-
-public class T_iconst_2_1 {
-
-    public int run() {
-        return 2;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_2.j
deleted file mode 100644
index d0a6b7e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iconst_2_2.java
-.class public dxc/junit/opcodes/iconst_2/jm/T_iconst_2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-;    .limit locals 1
-
-    iconst_2
-    iconst_2    
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_2.java
deleted file mode 100644
index c9b35a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_2/jm/T_iconst_2_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 dxc.junit.opcodes.iconst_2.jm;
-
-public class T_iconst_2_2 {
-
-    public int run() {
-        return 2;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/Test_iconst_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/Test_iconst_3.java
deleted file mode 100644
index 7c35d71..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/Test_iconst_3.java
+++ /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.
- */
-
-package dxc.junit.opcodes.iconst_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iconst_3.jm.T_iconst_3_1;
-
-public class Test_iconst_3 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_iconst_3_1 t = new T_iconst_3_1();
-        int b = 1237;
-        int c = 1234;
-        int d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iconst_3.jm.T_iconst_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_1.j
deleted file mode 100644
index ef97813..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_1.j
+++ /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_iconst_3_1.java
-.class public dxc/junit/opcodes/iconst_3/jm/T_iconst_3_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    iconst_3
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_1.java
deleted file mode 100644
index c3ce680..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_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 dxc.junit.opcodes.iconst_3.jm;
-
-public class T_iconst_3_1 {
-
-    public int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_2.j
deleted file mode 100644
index 9c501dd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iconst_3_2.java
-.class public dxc/junit/opcodes/iconst_3/jm/T_iconst_3_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-;    .limit locals 1
-
-    iconst_3
-    iconst_3
-    
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_2.java
deleted file mode 100644
index 2e5cfc3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_3/jm/T_iconst_3_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 dxc.junit.opcodes.iconst_3.jm;
-
-public class T_iconst_3_2 {
-
-    public int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/Test_iconst_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/Test_iconst_4.java
deleted file mode 100644
index f883f6d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/Test_iconst_4.java
+++ /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.
- */
-
-package dxc.junit.opcodes.iconst_4;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iconst_4.jm.T_iconst_4_1;
-
-public class Test_iconst_4 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_iconst_4_1 t = new T_iconst_4_1();
-        int b = 1238;
-        int c = 1234;
-        int d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iconst_4.jm.T_iconst_4_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_1.j
deleted file mode 100644
index 0bc6c6a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_1.j
+++ /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_iconst_4_1.java
-.class public dxc/junit/opcodes/iconst_4/jm/T_iconst_4_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    iconst_4
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_1.java
deleted file mode 100644
index b662051..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_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 dxc.junit.opcodes.iconst_4.jm;
-
-public class T_iconst_4_1 {
-
-    public int run() {
-        return 4;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_2.j
deleted file mode 100644
index 36ae08b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iconst_4_2.java
-.class public dxc/junit/opcodes/iconst_4/jm/T_iconst_4_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-;    .limit locals 1
-
-    iconst_4
-    iconst_4    
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_2.java
deleted file mode 100644
index effef30..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_4/jm/T_iconst_4_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 dxc.junit.opcodes.iconst_4.jm;
-
-public class T_iconst_4_2 {
-
-    public int run() {
-        return 4;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/Test_iconst_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/Test_iconst_5.java
deleted file mode 100644
index 6fbe360..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/Test_iconst_5.java
+++ /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.
- */
-
-package dxc.junit.opcodes.iconst_5;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iconst_5.jm.T_iconst_5_1;
-
-public class Test_iconst_5 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_iconst_5_1 t = new T_iconst_5_1();
-        int b = 1239;
-        int c = 1234;
-        int d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iconst_5.jm.T_iconst_5_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_1.j
deleted file mode 100644
index 12b2f81..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_1.j
+++ /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_iconst_5_1.java
-.class public dxc/junit/opcodes/iconst_5/jm/T_iconst_5_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    iconst_5
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_1.java
deleted file mode 100644
index 0762065..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_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 dxc.junit.opcodes.iconst_5.jm;
-
-public class T_iconst_5_1 {
-
-    public int run() {
-        return 5;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_2.j
deleted file mode 100644
index 307c804..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iconst_5_2.java
-.class public dxc/junit/opcodes/iconst_5/jm/T_iconst_5_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-;    .limit locals 1
-
-    iconst_5
-    iconst_5
-        
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_2.java
deleted file mode 100644
index ec01b76..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_5/jm/T_iconst_5_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 dxc.junit.opcodes.iconst_5.jm;
-
-public class T_iconst_5_2 {
-
-    public int run() {
-        return 5;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/Test_iconst_m1.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/Test_iconst_m1.java
deleted file mode 100644
index 9eb2765..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/Test_iconst_m1.java
+++ /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.
- */
-
-package dxc.junit.opcodes.iconst_m1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iconst_m1.jm.T_iconst_m1_1;
-
-public class Test_iconst_m1 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_iconst_m1_1 t = new T_iconst_m1_1();
-        int b = 1233;
-        int c = 1234;
-        int d = b - c;
-        assertEquals(d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iconst_m1.jm.T_iconst_m1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_1.j
deleted file mode 100644
index 4cc89b1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_1.j
+++ /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_iconst_m1_1.java
-.class public dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_1.java
deleted file mode 100644
index e54eee4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_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 dxc.junit.opcodes.iconst_m1.jm;
-
-public class T_iconst_m1_1 {
-
-    public int run() {
-        return -1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_2.j
deleted file mode 100644
index 68cb7ee..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_2.j
+++ /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_iconst_m1_2.java
-.class public dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 1
-;    .limit locals 1
-
-    iconst_m1
-    iconst_m1    
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_2.java
deleted file mode 100644
index ad1c701..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iconst_m1/jm/T_iconst_m1_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 dxc.junit.opcodes.iconst_m1.jm;
-
-public class T_iconst_m1_2 {
-
-    public int run() {
-        return -1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/Test_idiv.java b/tools/dx-tests/src/dxc/junit/opcodes/idiv/Test_idiv.java
deleted file mode 100644
index 73ca296..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/Test_idiv.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.idiv;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.idiv.jm.T_idiv_1;
-
-public class Test_idiv extends DxTestCase {
-
-    /**
-     * @title Arguments = 8, 4
-     */
-    public void testN1() {
-        T_idiv_1 t = new T_idiv_1();
-        assertEquals(2, t.run(8, 4));
-    }
-
-    /**
-     * @title  Rounding
-     */
-    public void testN2() {
-        T_idiv_1 t = new T_idiv_1();
-        assertEquals(268435455, t.run(1073741823, 4));
-    }
-
-    /**
-     * @title  Dividend = 0
-     */
-    public void testN3() {
-        T_idiv_1 t = new T_idiv_1();
-        assertEquals(0, t.run(0, 4));
-    }
-
-    /**
-     * @title  Dividend is negative
-     */
-    public void testN4() {
-        T_idiv_1 t = new T_idiv_1();
-        assertEquals(-3, t.run(-10, 3));
-    }
-
-    /**
-     * @title  Divisor is negative
-     */
-    public void testN5() {
-        T_idiv_1 t = new T_idiv_1();
-        assertEquals(-357913941, t.run(1073741824, -3));
-    }
-
-    /**
-     * @title  Both Dividend and divisor are negative
-     */
-    public void testN6() {
-        T_idiv_1 t = new T_idiv_1();
-        assertEquals(5965, t.run(-17895697, -3000));
-    }
-
-    /**
-     * @title Arguments = Integer.MIN_VALUE, -1
-     */
-    public void testB1() {
-        T_idiv_1 t = new T_idiv_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_idiv_1 t = new T_idiv_1();
-        assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE, 1));
-    }
-
-    /**
-     * @title Arguments = Integer.MAX_VALUE, 1
-     */
-    public void testB3() {
-        T_idiv_1 t = new T_idiv_1();
-        assertEquals(Integer.MAX_VALUE, t.run(Integer.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title Arguments = Integer.MIN_VALUE, Integer.MAX_VALUE
-     */
-    public void testB4() {
-        T_idiv_1 t = new T_idiv_1();
-        assertEquals(-1, t.run(Integer.MIN_VALUE, Integer.MAX_VALUE));
-    }
-    
-    /**
-     * @title Arguments = 1, Integer.MAX_VALUE
-     */
-    public void testB5() {
-        T_idiv_1 t = new T_idiv_1();
-        assertEquals(0, t.run(1, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title Arguments = 1, Integer.MIN_VALUE
-     */
-    public void testB6() {
-        T_idiv_1 t = new T_idiv_1();
-        assertEquals(0, t.run(1, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Divisor is 0
-     */
-    public void testE1() {
-        T_idiv_1 t = new T_idiv_1();
-        try {
-            t.run(1, 0);
-            fail("expected ArithmeticException");
-        } catch (ArithmeticException ae) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.idiv.jm.T_idiv_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int / double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.idiv.jm.T_idiv_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.idiv.jm.T_idiv_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference / int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.idiv.jm.T_idiv_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_1.j b/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_1.j
deleted file mode 100644
index 97b601d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_idiv_1.java
-.class public dxc/junit/opcodes/idiv/jm/T_idiv_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    idiv
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_1.java b/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_1.java
deleted file mode 100644
index b3e1ecc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_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 dxc.junit.opcodes.idiv.jm;
-
-public class T_idiv_1 {
-
-    public int run(int a, int b) {
-        return a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_2.j b/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_2.j
deleted file mode 100644
index 71cd321..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_idiv_2.java
-.class public dxc/junit/opcodes/idiv/jm/T_idiv_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    ; iload_2    
-    idiv
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_2.java b/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_2.java
deleted file mode 100644
index ec8834c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_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 dxc.junit.opcodes.idiv.jm;
-
-public class T_idiv_2 {
-
-    public int run(int a, int b) {
-        return a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_3.j b/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_3.j
deleted file mode 100644
index 897b705..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_idiv_3.java
-.class public dxc/junit/opcodes/idiv/jm/T_idiv_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(ID)I
-    .limit stack 3
-    .limit locals 5
-    iload_1
-    dload_2    
-    idiv
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_3.java b/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_3.java
deleted file mode 100644
index a28eb6a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_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 dxc.junit.opcodes.idiv.jm;
-
-public class T_idiv_3 {
-
-    public int run(int a, double b) {
-        return a/(int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_4.j b/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_4.j
deleted file mode 100644
index ddf5f01..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_4.j
+++ /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_idiv_4.java
-.class public dxc/junit/opcodes/idiv/jm/T_idiv_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JI)I
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-;    l2i
-    iload_3
-    idiv
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_4.java b/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_4.java
deleted file mode 100644
index c2cf3dd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_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 dxc.junit.opcodes.idiv.jm;
-
-public class T_idiv_4 {
-
-    public int run(long a, int b) {
-        return (int)a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_5.j b/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_5.j
deleted file mode 100644
index 20b4402..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_idiv_5.java
-.class public dxc/junit/opcodes/idiv/jm/T_idiv_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    idiv
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_5.java b/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_5.java
deleted file mode 100644
index c5a3579..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/idiv/jm/T_idiv_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 dxc.junit.opcodes.idiv.jm;
-
-public class T_idiv_5 {
-    
-    public int run(int a, int b) {
-        return a/b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/Test_if_acmpeq.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/Test_if_acmpeq.java
deleted file mode 100644
index 2591871..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/Test_if_acmpeq.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.if_acmpeq;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.if_acmpeq.jm.T_if_acmpeq_1;
-
-public class Test_if_acmpeq extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_if_acmpeq_1 t = new T_if_acmpeq_1();
-        String a = "a";
-        String b = "b";
-
-        /*
-         * Compare with 1234 to check that in case of failed comparison
-         * execution proceeds at the address following if_acmpeq instruction
-         */
-        assertEquals(1234, t.run(a, b));
-    }
-
-    /**
-     * @title  normal test
-     */
-    public void testN2() {
-        T_if_acmpeq_1 t = new T_if_acmpeq_1();
-        String a = "a";
-        assertEquals(1, t.run(a, a));
-    }
-
-    /**
-     * @title  Compare with null
-     */
-    public void testB1() {
-        T_if_acmpeq_1 t = new T_if_acmpeq_1();
-        String a = "a";
-        assertEquals(1234, t.run(null, a));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_acmpeq.jm.T_if_acmpeq_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_acmpeq.jm.T_if_acmpeq_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference,
-     * integer
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_acmpeq.jm.T_if_acmpeq_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_acmpeq.jm.T_if_acmpeq_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_acmpeq.jm.T_if_acmpeq_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_1.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_1.j
deleted file mode 100644
index c31a282..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_1.j
+++ /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_if_acmpeq_1.java
-.class public dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(Ljava/lang/String;Ljava/lang/String;)I
-    .limit stack 2
-    .limit locals 3
-    aload_1
-    aload_2
-    if_acmpeq Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_1.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_1.java
deleted file mode 100644
index e72a4fb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_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 dxc.junit.opcodes.if_acmpeq.jm;
-
-public class T_if_acmpeq_1 {
-
-    public int run(String a, String b) {
-        return a == b ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_2.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_2.j
deleted file mode 100644
index 51fb9e4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_2.j
+++ /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_acmpeq_2.java
-.class public dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)Z
-    .limit stack 2
-    .limit locals 3
-;    aload_1
-    aload_2
-    if_acmpeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_2.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_2.java
deleted file mode 100644
index f346bae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_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 dxc.junit.opcodes.if_acmpeq.jm;
-
-public class T_if_acmpeq_2 {
-
-    public boolean run(String a, String b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_3.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_3.j
deleted file mode 100644
index cc93549..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_3.j
+++ /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_if_acmpeq_3.java
-.class public dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)Z
-    .limit stack 4
-    .limit locals 3
-
-    aload_1
-    dconst_1
-    if_acmpeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_3.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_3.java
deleted file mode 100644
index 2f986fb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_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 dxc.junit.opcodes.if_acmpeq.jm;
-
-public class T_if_acmpeq_3 {
-
-    public boolean run(String a, String b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_4.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_4.j
deleted file mode 100644
index 3541259..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_4.j
+++ /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_if_acmpeq_4.java
-.class public dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    iconst_1
-    
-    if_acmpeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_4.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_4.java
deleted file mode 100644
index 995a198..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_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 dxc.junit.opcodes.if_acmpeq.jm;
-
-public class T_if_acmpeq_4 {
-
-    public boolean run(String a, String b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5.cfh
deleted file mode 100644
index 657c425..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5.cfh
+++ /dev/null
@@ -1,197 +0,0 @@
-//@class:dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 42, h: 0002: utf8{"(Ljava/lang/String;Ljava/lang/String;)Z"}
-    // .  .  '  (  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  )  Z  
-       01 00 27 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 29 5a 
-    // parsed:, offset 57, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 76, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 89, len 47, h: 0005: utf8{"dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  a  c  m  p  e  q  /  j  m  /  T  _  i  f  _  a  c  m  p  e  q  _  5  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 61 63 6d 70 65 71 2f 6a 6d 2f 54 5f 69 66 5f 61 63 6d 70 65 71 5f 35 
-    // parsed:, offset 136, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 145, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 151, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0a 
-    // parsed:, offset 156, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 163, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 169, len 3, h: 000b: type{dxc.junit.opcodes.if_acmpeq.jm.T_if_acmpeq_5}
-    // .  .  .  
-       07 00 05 
-    // parsed:, offset 172, len 21, h: 000c: utf8{"T_if_acmpeq_5.java"}
-    // .  .  .  T  _  i  f  _  a  c  m  p  e  q  _  5  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 61 63 6d 70 65 71 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 193, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 196, len 0, h: end constant_pool
-// parsed:, offset 196, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 198, len 2, h: this_class: type{dxc.junit.opcodes.if_acmpeq.jm.T_if_acmpeq_5}
-// .  .  
-   00 0b 
-// parsed:, offset 200, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 202, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 204, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 206, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 208, len:76,desc: ()V
-// parsed:, offset 208, len 0, h:  methods[0]: 
-    // parsed:, offset 208, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 210, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 212, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 214, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 216, len 0, h:  attributes[0]: 
-        // parsed:, offset 216, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 218, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 222, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 224, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 235, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 237, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 239, len 0, h: end attributes[0] 
-// parsed:, offset 239, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 239, len:45,desc: (Ljava/lang/String;Ljava/lang/String;)Z
-// parsed:, offset 239, len 0, h:  methods[1]: 
-    // parsed:, offset 239, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 241, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 243, len 2, h: descriptor: (Ljava/lang/String;Ljava/lang/String;)Z
-    // .  .  
-       00 02 
-    // parsed:, offset 245, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 247, len 0, h:  attributes[0]: 
-        // parsed:, offset 247, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 249, len 4, h: length: 00000015
-        // .  .  .  .  
-           00 00 00 15 
-        // parsed:, offset 253, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 255, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 257, len 4, h: code_length: 00000009
-        // .  .  .  .  
-           00 00 00 09 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 1, h: 0001: aload_2 // 02
-        // ,  
-           2c 
-        // parsed:, offset 2, len 3, h: 0002: if_acmpeq 0007
-        // .  .  .  
-//@mod     a5 00 05    
-           a5 00 ff 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 8, len 1, h: 0008: ireturn
-        // .  
-           ac 
-        // parsed:, offset 270, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 272, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 274, len 0, h: end attributes[0] 
-// parsed:, offset 274, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/String;Ljava/lang/String;)Z
-// parsed:, offset 274, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 276, len 0, h:  attributes[0]: 
-    // parsed:, offset 276, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 278, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 282, len 2, h: source: utf8{"T_if_acmpeq_5.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 284, len 0, h: end attributes[0] 
-// parsed:, offset 284, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5.j
deleted file mode 100644
index 12d77df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5.j
+++ /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_if_acmpeq_5.java
-.class public dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)Z
-    .limit stack 2
-    .limit locals 3
-    
-    aload_1
-    aload_2
-    if_acmpeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_5.java
deleted file mode 100644
index ec022a5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_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 dxc.junit.opcodes.if_acmpeq.jm;
-
-public class T_if_acmpeq_5 {
-
-    public boolean run(String a, String b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6.cfh
deleted file mode 100644
index 3b400e22..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6.cfh
+++ /dev/null
@@ -1,205 +0,0 @@
-//@class:dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 09 
-    // parsed:, offset 15, len 42, h: 0002: utf8{"(Ljava/lang/String;Ljava/lang/String;)Z"}
-    // .  .  '  (  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  )  Z  
-       01 00 27 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 29 5a 
-    // parsed:, offset 57, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 76, len 47, h: 0004: utf8{"dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  a  c  m  p  e  q  /  j  m  /  T  _  i  f  _  a  c  m  p  e  q  _  6  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 61 63 6d 70 65 71 2f 6a 6d 2f 54 5f 69 66 5f 61 63 6d 70 65 71 5f 36 
-    // parsed:, offset 123, len 13, h: 0005: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 136, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 145, len 21, h: 0007: utf8{"T_if_acmpeq_6.java"}
-    // .  .  .  T  _  i  f  _  a  c  m  p  e  q  _  6  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 61 63 6d 70 65 71 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 166, len 6, h: 0008: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 172, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0b 
-    // parsed:, offset 177, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 184, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 190, len 3, h: 000c: type{dxc.junit.opcodes.if_acmpeq.jm.T_if_acmpeq_6}
-    // .  .  .  
-       07 00 04 
-    // parsed:, offset 193, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 196, len 0, h: end constant_pool
-// parsed:, offset 196, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 198, len 2, h: this_class: type{dxc.junit.opcodes.if_acmpeq.jm.T_if_acmpeq_6}
-// .  .  
-   00 0c 
-// parsed:, offset 200, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 202, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 204, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 206, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 208, len:79,desc: ()V
-// parsed:, offset 208, len 0, h:  methods[0]: 
-    // parsed:, offset 208, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 210, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 212, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 214, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 216, len 0, h:  attributes[0]: 
-        // parsed:, offset 216, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 218, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 222, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 224, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 235, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 237, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 239, len 0, h: end attributes[0] 
-// parsed:, offset 239, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 239, len:48,desc: (Ljava/lang/String;Ljava/lang/String;)Z
-// parsed:, offset 239, len 0, h:  methods[1]: 
-    // parsed:, offset 239, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 241, len 2, h: name: run
-    // .  .  
-       00 08 
-    // parsed:, offset 243, len 2, h: descriptor: (Ljava/lang/String;Ljava/lang/String;)Z
-    // .  .  
-       00 02 
-    // parsed:, offset 245, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 247, len 0, h:  attributes[0]: 
-        // parsed:, offset 247, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 249, len 4, h: length: 00000018
-        // .  .  .  .  
-           00 00 00 18 
-        // parsed:, offset 253, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 255, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 257, len 4, h: code_length: 0000000c
-        // .  .  .  .  
-           00 00 00 0c 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 1, h: 0001: aload_2 // 02
-        // ,  
-           2c 
-        // parsed:, offset 2, len 3, h: 0002: if_acmpeq 0008
-        // .  .  .  
-//@mod     a5 00 05    
-           a5 00 06 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: wide
-        // .
-//@mod     00      
-           c4 
-        // parsed:, offset 8, len 2, h: 0008: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 10, len 1, h: 000a: nop
-        // . 
-//@mod     00     
-           02 
-        // parsed:, offset 11, len 1, h: 000b: ireturn
-        // .  
-           ac 
-        // parsed:, offset 273, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 275, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 277, len 0, h: end attributes[0] 
-// parsed:, offset 277, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/String;Ljava/lang/String;)Z
-// parsed:, offset 277, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 279, len 0, h:  attributes[0]: 
-    // parsed:, offset 279, len 2, h: name: SourceFile
-    // .  .  
-       00 05 
-    // parsed:, offset 281, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 285, len 2, h: source: utf8{"T_if_acmpeq_6.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 287, len 0, h: end attributes[0] 
-// parsed:, offset 287, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6.j
deleted file mode 100644
index 855ba59..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6.j
+++ /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_if_acmpeq_6.java
-.class public dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)Z
-    .limit stack 2
-    .limit locals 3
-    aload_1
-    aload_2
-    if_acmpeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-    ; iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_6.java
deleted file mode 100644
index 3e5bb90..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpeq/jm/T_if_acmpeq_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 dxc.junit.opcodes.if_acmpeq.jm;
-
-public class T_if_acmpeq_6 {
-
-    public boolean run(String a, String b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/Test_if_acmpne.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/Test_if_acmpne.java
deleted file mode 100644
index 012742d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/Test_if_acmpne.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.if_acmpne;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.if_acmpne.jm.T_if_acmpne_1;
-
-public class Test_if_acmpne extends DxTestCase {
-
-    /**
-     * @title  normal test
-     */
-    public void testN1() {
-        T_if_acmpne_1 t = new T_if_acmpne_1();
-        String a = "a";
-        String b = "b";
-        /*
-         * Compare with 1234 to check that in case of failed comparison
-         * execution proceeds at the address following if_acmpeq instruction
-         */
-        assertEquals(1234, t.run(a, b));
-    }
-
-    /**
-     * @title  normal test
-     */
-    public void testN2() {
-        T_if_acmpne_1 t = new T_if_acmpne_1();
-        String a = "a";
-        assertEquals(1, t.run(a, a));
-    }
-
-    /**
-     * @title  Compare with null
-     */
-    public void testB1() {
-        T_if_acmpne_1 t = new T_if_acmpne_1();
-        String a = "a";
-        assertEquals(1234, t.run(a, null));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_acmpne.jm.T_if_acmpne_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_acmpne.jm.T_if_acmpne_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference,
-     * integer
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_acmpne.jm.T_if_acmpne_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_acmpne.jm.T_if_acmpne_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_acmpne.jm.T_if_acmpne_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_1.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_1.j
deleted file mode 100644
index b500b91..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_1.j
+++ /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_if_acmpne_1.java
-.class public dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(Ljava/lang/String;Ljava/lang/String;)I
-    .limit stack 2
-    .limit locals 3
-   
-    aload_1
-    aload_2
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    sipush 1234
-    ireturn
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_1.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_1.java
deleted file mode 100644
index 4485e6f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_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 dxc.junit.opcodes.if_acmpne.jm;
-
-public class T_if_acmpne_1 {
-
-    public int run(String a, String b) {
-        return a == b ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_2.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_2.j
deleted file mode 100644
index 1e84a6e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_2.j
+++ /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_if_acmpne_2.java
-.class public dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-;    aload_2
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_2.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_2.java
deleted file mode 100644
index 52b734c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_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 dxc.junit.opcodes.if_acmpne.jm;
-
-public class T_if_acmpne_2 {
-
-    public boolean run(String a, String b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_3.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_3.j
deleted file mode 100644
index 48c32da..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_3.j
+++ /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_if_acmpne_3.java
-.class public dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)Z
-    .limit stack 4
-    .limit locals 3
-   
-    aload_1
-    dconst_1
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_3.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_3.java
deleted file mode 100644
index 609e0ad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_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 dxc.junit.opcodes.if_acmpne.jm;
-
-public class T_if_acmpne_3 {
-
-    public boolean run(String a, String b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_4.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_4.j
deleted file mode 100644
index b167481..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_4.j
+++ /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_if_acmpne_4.java
-.class public dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)Z
-    .limit stack 2
-    .limit locals 3
-   
-    aload_1
-    iconst_1
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_4.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_4.java
deleted file mode 100644
index 1abd87a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_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 dxc.junit.opcodes.if_acmpne.jm;
-
-public class T_if_acmpne_4 {
-
-    public boolean run(String a, String b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5.cfh
deleted file mode 100644
index 85dfc7a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5.cfh
+++ /dev/null
@@ -1,197 +0,0 @@
-//@class:dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 47, h: 0001: utf8{"dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  a  c  m  p  n  e  /  j  m  /  T  _  i  f  _  a  c  m  p  n  e  _  5  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 61 63 6d 70 6e 65 2f 6a 6d 2f 54 5f 69 66 5f 61 63 6d 70 6e 65 5f 35 
-    // parsed:, offset 57, len 5, h: 0002: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 62, len 42, h: 0003: utf8{"(Ljava/lang/String;Ljava/lang/String;)Z"}
-    // .  .  '  (  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  )  Z  
-       01 00 27 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 29 5a 
-    // parsed:, offset 104, len 19, h: 0004: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 123, len 13, h: 0005: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 136, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 145, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 151, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0a 
-    // parsed:, offset 156, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 163, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 169, len 3, h: 000b: type{dxc.junit.opcodes.if_acmpne.jm.T_if_acmpne_5}
-    // .  .  .  
-       07 00 01 
-    // parsed:, offset 172, len 21, h: 000c: utf8{"T_if_acmpne_5.java"}
-    // .  .  .  T  _  i  f  _  a  c  m  p  n  e  _  5  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 61 63 6d 70 6e 65 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 193, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 04 
-// parsed:, offset 196, len 0, h: end constant_pool
-// parsed:, offset 196, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 198, len 2, h: this_class: type{dxc.junit.opcodes.if_acmpne.jm.T_if_acmpne_5}
-// .  .  
-   00 0b 
-// parsed:, offset 200, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 202, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 204, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 206, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 208, len:76,desc: ()V
-// parsed:, offset 208, len 0, h:  methods[0]: 
-    // parsed:, offset 208, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 210, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 212, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 214, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 216, len 0, h:  attributes[0]: 
-        // parsed:, offset 216, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 218, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 222, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 224, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 02 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 235, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 237, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 239, len 0, h: end attributes[0] 
-// parsed:, offset 239, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 239, len:45,desc: (Ljava/lang/String;Ljava/lang/String;)Z
-// parsed:, offset 239, len 0, h:  methods[1]: 
-    // parsed:, offset 239, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 241, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 243, len 2, h: descriptor: (Ljava/lang/String;Ljava/lang/String;)Z
-    // .  .  
-       00 03 
-    // parsed:, offset 245, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 247, len 0, h:  attributes[0]: 
-        // parsed:, offset 247, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 249, len 4, h: length: 00000015
-        // .  .  .  .  
-           00 00 00 15 
-        // parsed:, offset 253, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 255, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 257, len 4, h: code_length: 00000009
-        // .  .  .  .  
-           00 00 00 09 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 1, h: 0001: aload_2 // 02
-        // ,  
-           2c 
-        // parsed:, offset 2, len 3, h: 0002: if_acmpne 00ff
-        // .  .  .  
-//@mod     a6 00 05    
-           a6 00 ff 
-        // parsed:, offset 5, len 1, h: 0005: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 8, len 1, h: 0008: ireturn
-        // .  
-           ac 
-        // parsed:, offset 270, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 272, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 274, len 0, h: end attributes[0] 
-// parsed:, offset 274, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/String;Ljava/lang/String;)Z
-// parsed:, offset 274, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 276, len 0, h:  attributes[0]: 
-    // parsed:, offset 276, len 2, h: name: SourceFile
-    // .  .  
-       00 05 
-    // parsed:, offset 278, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 282, len 2, h: source: utf8{"T_if_acmpne_5.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 284, len 0, h: end attributes[0] 
-// parsed:, offset 284, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5.j
deleted file mode 100644
index 46a46dd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5.j
+++ /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_if_acmpne_5.java
-.class public dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)Z
-    .limit stack 2
-    .limit locals 3
-   
-    aload_1
-    aload_2
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_5.java
deleted file mode 100644
index 1eb6ef6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_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 dxc.junit.opcodes.if_acmpne.jm;
-
-public class T_if_acmpne_5 {
-
-    public boolean run(String a, String b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6.cfh
deleted file mode 100644
index ffe5bbf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6.cfh
+++ /dev/null
@@ -1,204 +0,0 @@
-//@class:dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 08 
-    // parsed:, offset 15, len 42, h: 0002: utf8{"(Ljava/lang/String;Ljava/lang/String;)Z"}
-    // .  .  '  (  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  )  Z  
-       01 00 27 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 29 5a 
-    // parsed:, offset 57, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 76, len 21, h: 0004: utf8{"T_if_acmpne_6.java"}
-    // .  .  .  T  _  i  f  _  a  c  m  p  n  e  _  6  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 61 63 6d 70 6e 65 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 97, len 13, h: 0005: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 110, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 119, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 125, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0a 
-    // parsed:, offset 130, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 137, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 143, len 3, h: 000b: type{dxc.junit.opcodes.if_acmpne.jm.T_if_acmpne_6}
-    // .  .  .  
-       07 00 0d 
-    // parsed:, offset 146, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 149, len 47, h: 000d: utf8{"dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  a  c  m  p  n  e  /  j  m  /  T  _  i  f  _  a  c  m  p  n  e  _  6  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 61 63 6d 70 6e 65 2f 6a 6d 2f 54 5f 69 66 5f 61 63 6d 70 6e 65 5f 36 
-// parsed:, offset 196, len 0, h: end constant_pool
-// parsed:, offset 196, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 198, len 2, h: this_class: type{dxc.junit.opcodes.if_acmpne.jm.T_if_acmpne_6}
-// .  .  
-   00 0b 
-// parsed:, offset 200, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 202, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 204, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 206, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 208, len:79,desc: ()V
-// parsed:, offset 208, len 0, h:  methods[0]: 
-    // parsed:, offset 208, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 210, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 212, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 214, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 216, len 0, h:  attributes[0]: 
-        // parsed:, offset 216, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 218, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 222, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 224, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 235, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 237, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 239, len 0, h: end attributes[0] 
-// parsed:, offset 239, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 239, len:48,desc: (Ljava/lang/String;Ljava/lang/String;)Z
-// parsed:, offset 239, len 0, h:  methods[1]: 
-    // parsed:, offset 239, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 241, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 243, len 2, h: descriptor: (Ljava/lang/String;Ljava/lang/String;)Z
-    // .  .  
-       00 02 
-    // parsed:, offset 245, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 247, len 0, h:  attributes[0]: 
-        // parsed:, offset 247, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 249, len 4, h: length: 00000018
-        // .  .  .  .  
-           00 00 00 18 
-        // parsed:, offset 253, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 255, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 257, len 4, h: code_length: 0000000c
-        // .  .  .  .  
-           00 00 00 0c 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 1, h: 0001: aload_2 // 02
-        // ,  
-           2c 
-        // parsed:, offset 2, len 3, h: 0002: if_acmpne 0008
-        // .  .  .  
-//@mod     a6 00 05    
-           a6 00 06 
-        // parsed:, offset 5, len 1, h: 0005: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 8, len 2, h: 0008: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 10, len 1, h: 000a: nop
-        // .  
-           00 
-        // parsed:, offset 11, len 1, h: 000b: ireturn
-        // .  
-           ac 
-        // parsed:, offset 273, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 275, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 277, len 0, h: end attributes[0] 
-// parsed:, offset 277, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/String;Ljava/lang/String;)Z
-// parsed:, offset 277, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 279, len 0, h:  attributes[0]: 
-    // parsed:, offset 279, len 2, h: name: SourceFile
-    // .  .  
-       00 05 
-    // parsed:, offset 281, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 285, len 2, h: source: utf8{"T_if_acmpne_6.java"}
-    // .  .  
-       00 04 
-// parsed:, offset 287, len 0, h: end attributes[0] 
-// parsed:, offset 287, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6.j b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6.j
deleted file mode 100644
index 0ff4d66..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6.j
+++ /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_if_acmpne_6.java
-.class public dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/String;Ljava/lang/String;)Z
-    .limit stack 2
-    .limit locals 3
-   
-    aload_1
-    aload_2
-    if_acmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-     nop
-    iload 1
-    nop    
-;    iconst_0
-    ireturn
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6.java b/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_6.java
deleted file mode 100644
index 24fc8f3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_acmpne/jm/T_if_acmpne_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 dxc.junit.opcodes.if_acmpne.jm;
-
-public class T_if_acmpne_6 {
-
-    public boolean run(String a, String b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/Test_if_icmpeq.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/Test_if_icmpeq.java
deleted file mode 100644
index b538559..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/Test_if_icmpeq.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 dxc.junit.opcodes.if_icmpeq;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_1;
-
-public class Test_if_icmpeq extends DxTestCase {
-
-    /**
-     * @title  Arguments = 5, 6
-     */
-    public void testN1() {
-        T_if_icmpeq_1 t = new T_if_icmpeq_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, 6));
-    }
-
-    /**
-     * @title  Arguments = 0x0f0e0d0c, 0x0f0e0d0c
-     */
-    public void testN2() {
-        T_if_icmpeq_1 t = new T_if_icmpeq_1();
-        assertEquals(1, t.run(0x0f0e0d0c, 0x0f0e0d0c));
-    }
-
-    /**
-     * @title  Arguments = 5, -5
-     */
-    public void testN3() {
-        T_if_icmpeq_1 t = new T_if_icmpeq_1();
-        assertEquals(1234, t.run(5, -5));
-    }
-
-    /**
-     * @title  Arguments = 0x01001234, 0x1234
-     */
-    public void testN4() {
-        T_if_icmpeq_1 t = new T_if_icmpeq_1();
-        assertEquals(1234, t.run(0x01001234, 0x1234));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_if_icmpeq_1 t = new T_if_icmpeq_1();
-        assertEquals(1, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_if_icmpeq_1 t = new T_if_icmpeq_1();
-        assertEquals(1, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = 0, 1234567
-     */
-    public void testB3() {
-        T_if_icmpeq_1 t = new T_if_icmpeq_1();
-        assertEquals(1234, t.run(0, 1234567));
-    }
-
-    /**
-     * @title  Arguments = 0, 0
-     */
-    public void testB4() {
-        T_if_icmpeq_1 t = new T_if_icmpeq_1();
-        assertEquals(1, t.run(0, 0));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_1.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_1.j
deleted file mode 100644
index d15a155..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_1.j
+++ /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_if_icmpeq_1.java
-.class public dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-    iload_2
-    
-    if_icmpeq Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_1.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_1.java
deleted file mode 100644
index 392360e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_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 dxc.junit.opcodes.if_icmpeq.jm;
-
-public class T_if_icmpeq_1 {
-
-    public int run(int a, int b) {
-        return a == b ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_2.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_2.j
deleted file mode 100644
index ca05c70..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_2.j
+++ /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_if_icmpeq_2.java
-.class public dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    if_icmpeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_2.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_2.java
deleted file mode 100644
index a437976..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_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 dxc.junit.opcodes.if_icmpeq.jm;
-
-public class T_if_icmpeq_2 {
-
-    public boolean run(int a, int b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_3.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_3.j
deleted file mode 100644
index fc9e4aa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_3.j
+++ /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_if_icmpeq_3.java
-.class public dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 4
-    .limit locals 3
-
-    iload_1
-    dconst_1
-    if_icmpeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_3.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_3.java
deleted file mode 100644
index bc636ce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_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 dxc.junit.opcodes.if_icmpeq.jm;
-
-public class T_if_icmpeq_3 {
-
-    public boolean run(int a, int b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_4.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_4.j
deleted file mode 100644
index 98266e8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_4.j
+++ /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_if_icmpeq_4.java
-.class public dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-    iload_1
-    ;iload_2
-
-    if_icmpeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_4.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_4.java
deleted file mode 100644
index 4923485..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_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 dxc.junit.opcodes.if_icmpeq.jm;
-
-public class T_if_icmpeq_4 {
-
-    public boolean run(int a, int b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5.cfh
deleted file mode 100644
index 00dbe44..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5.cfh
+++ /dev/null
@@ -1,197 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 3, h: 0001: type{dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_5}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 13, len 5, h: 0002: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 09 
-    // parsed:, offset 18, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 37, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 50, len 8, h: 0005: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 58, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 67, len 21, h: 0007: utf8{"T_if_icmpeq_5.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  e  q  _  5  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 65 71 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 88, len 6, h: 0008: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 94, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0c 
-    // parsed:, offset 99, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 106, len 47, h: 000b: utf8{"dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  e  q  /  j  m  /  T  _  i  f  _  i  c  m  p  e  q  _  5  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 65 71 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 65 71 5f 35 
-    // parsed:, offset 153, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_5}
-// .  .  
-   00 01 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:76,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 02 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:45,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 08 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 215, len 4, h: length: 00000015
-        // .  .  .  .  
-           00 00 00 15 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 00000009
-        // .  .  .  .  
-           00 00 00 09 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmpeq 0007
-        // .  .  .  
-//@mod     9f 00 05    
-           9f 00 ff 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 8, len 1, h: 0008: ireturn
-        // .  
-           ac 
-        // parsed:, offset 236, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 238, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 240, len 0, h: end attributes[0] 
-// parsed:, offset 240, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 240, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 242, len 0, h:  attributes[0]: 
-    // parsed:, offset 242, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 244, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 248, len 2, h: source: utf8{"T_if_icmpeq_5.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 250, len 0, h: end attributes[0] 
-// parsed:, offset 250, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5.j
deleted file mode 100644
index add33fe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5.j
+++ /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_if_icmpeq_5.java
-.class public dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmpeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_5.java
deleted file mode 100644
index c720274..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_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 dxc.junit.opcodes.if_icmpeq.jm;
-
-public class T_if_icmpeq_5 {
-
-    public boolean run(int a, int b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6.cfh
deleted file mode 100644
index d1d6b8c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6.cfh
+++ /dev/null
@@ -1,204 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 8, h: 0004: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 55, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 64, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 70, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 75, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 82, len 47, h: 0009: utf8{"dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  e  q  /  j  m  /  T  _  i  f  _  i  c  m  p  e  q  _  6  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 65 71 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 65 71 5f 36 
-    // parsed:, offset 129, len 21, h: 000a: utf8{"T_if_icmpeq_6.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  e  q  _  6  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 65 71 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 150, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 156, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 159, len 3, h: 000d: type{dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_6}
-    // .  .  .  
-       07 00 09 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmpeq.jm.T_if_icmpeq_6}
-// .  .  
-   00 0d 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:79,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:48,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 04 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 215, len 4, h: length: 00000018
-        // .  .  .  .  
-           00 00 00 18 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 0000000c
-        // .  .  .  .  
-           00 00 00 0c 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmpeq 0008
-        // .  .  .  
-//@mod     9f 00 05    
-           9f 00 06 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 8, len 2, h: 0008: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 10, len 1, h: 000a: nop
-        // .  
-           00 
-        // parsed:, offset 11, len 1, h: 000b: ireturn
-        // .  
-           ac 
-        // parsed:, offset 239, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 241, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 243, len 0, h: end attributes[0] 
-// parsed:, offset 243, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 243, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 245, len 0, h:  attributes[0]: 
-    // parsed:, offset 245, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 247, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 251, len 2, h: source: utf8{"T_if_icmpeq_6.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 253, len 0, h: end attributes[0] 
-// parsed:, offset 253, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6.j
deleted file mode 100644
index 2b6a7b8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6.j
+++ /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_if_icmpeq_6.java
-.class public dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmpeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_6.java
deleted file mode 100644
index ee004b7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_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 dxc.junit.opcodes.if_icmpeq.jm;
-
-public class T_if_icmpeq_6 {
-
-    public boolean run(int a, int b) {
-        return a == b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_7.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_7.j
deleted file mode 100644
index bee1c6c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_7.j
+++ /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_if_icmpeq_7.java
-.class public dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    aload_0
-    if_icmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_7.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_7.java
deleted file mode 100644
index 18aaaf9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpeq/jm/T_if_icmpeq_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 dxc.junit.opcodes.if_icmpeq.jm;
-
-public class T_if_icmpeq_7 {
-    
-    public boolean run(int a, int b) {
-        return a == b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/Test_if_icmpge.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/Test_if_icmpge.java
deleted file mode 100644
index ab38187..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/Test_if_icmpge.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.if_icmpge;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_1;
-
-public class Test_if_icmpge extends DxTestCase {
-
-    /**
-     * @title  Arguments = 5, 6
-     */
-    public void testN1() {
-        T_if_icmpge_1 t = new T_if_icmpge_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, 6));
-    }
-
-    /**
-     * @title  Arguments = 0x0f0e0d0c, 0x0f0e0d0c
-     */
-    public void testN2() {
-        T_if_icmpge_1 t = new T_if_icmpge_1();
-        assertEquals(1, t.run(0x0f0e0d0c, 0x0f0e0d0c));
-    }
-
-    /**
-     * @title  Arguments = 5, -5
-     */
-    public void testN3() {
-        T_if_icmpge_1 t = new T_if_icmpge_1();
-        assertEquals(1, t.run(5, -5));
-    }
-
-    /**
-     * @title  Arguments = 0x0f0e0d0d, 0x0f0e0d0c
-     */
-    public void testN4() {
-        T_if_icmpge_1 t = new T_if_icmpge_1();
-        assertEquals(1, t.run(0x0f0e0d0d, 0x0f0e0d0c));
-    }
-
-    /**
-     * @title  Arguments = 0x1234, 0x01001234
-     */
-    public void testN5() {
-        T_if_icmpge_1 t = new T_if_icmpge_1();
-        assertEquals(1234, t.run(0x1234, 0x01001234));
-    }
-
-    /**
-     * @title  Arguments = -5, 5
-     */
-    public void testN6() {
-        T_if_icmpge_1 t = new T_if_icmpge_1();
-        assertEquals(1234, t.run(-5, 5));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_if_icmpge_1 t = new T_if_icmpge_1();
-        assertEquals(1, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_if_icmpge_1 t = new T_if_icmpge_1();
-        assertEquals(1, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = 1234567, 0
-     */
-    public void testB3() {
-        T_if_icmpge_1 t = new T_if_icmpge_1();
-        assertEquals(1, t.run(1234567, 0));
-    }
-
-    /**
-     * @title  Arguments = 0, 1234567
-     */
-    public void testB4() {
-        T_if_icmpge_1 t = new T_if_icmpge_1();
-        assertEquals(1234, t.run(0, 1234567));
-    }
-
-    /**
-     * @title  Arguments = 0, 0
-     */
-    public void testB5() {
-        T_if_icmpge_1 t = new T_if_icmpge_1();
-        assertEquals(1, t.run(0, 0));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_1.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_1.j
deleted file mode 100644
index e283915..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_1.j
+++ /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_if_icmpge_1.java
-.class public dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-    iload_2
-    
-    if_icmpge Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_1.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_1.java
deleted file mode 100644
index 719b6d0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_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 dxc.junit.opcodes.if_icmpge.jm;
-
-public class T_if_icmpge_1 {
-
-    public int run(int a, int b) {
-        return a >= b ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_2.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_2.j
deleted file mode 100644
index 3c2e871..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_2.j
+++ /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_if_icmpge_2.java
-.class public dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    if_icmpge Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_2.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_2.java
deleted file mode 100644
index 175e276..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_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 dxc.junit.opcodes.if_icmpge.jm;
-
-public class T_if_icmpge_2 {
-
-    public boolean run(int a, int b) {
-        return a >= b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_3.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_3.j
deleted file mode 100644
index 7f4b515..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_3.j
+++ /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_if_icmpge_3.java
-.class public dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 4
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    dconst_1
-    if_icmpge Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_3.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_3.java
deleted file mode 100644
index 69addc3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_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 dxc.junit.opcodes.if_icmpge.jm;
-
-public class T_if_icmpge_3 {
-
-    public boolean run(int a, int b) {
-        return a >= b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_4.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_4.j
deleted file mode 100644
index f8a9ddd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_4.j
+++ /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_if_icmpge_4.java
-.class public dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-    iload_1
-    ;iload_2
-
-    if_icmpge Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_4.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_4.java
deleted file mode 100644
index 8347b6c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_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 dxc.junit.opcodes.if_icmpge.jm;
-
-public class T_if_icmpge_4 {
-
-    public boolean run(int a, int b) {
-        return a >= b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5.cfh
deleted file mode 100644
index 16399c0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5.cfh
+++ /dev/null
@@ -1,197 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 8, h: 0004: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 55, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 64, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 70, len 21, h: 0007: utf8{"T_if_icmpge_5.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  g  e  _  5  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 67 65 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 91, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0c 
-    // parsed:, offset 96, len 3, h: 0009: type{dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_5}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 99, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 106, len 47, h: 000b: utf8{"dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  g  e  /  j  m  /  T  _  i  f  _  i  c  m  p  g  e  _  5  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 67 65 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 67 65 5f 35 
-    // parsed:, offset 153, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_5}
-// .  .  
-   00 09 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:76,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:45,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 04 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 215, len 4, h: length: 00000015
-        // .  .  .  .  
-           00 00 00 15 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 00000009
-        // .  .  .  .  
-           00 00 00 09 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmpge 0007
-        // .  .  .  
-//@mod     a2 00 05    
-           a2 00 ff 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 8, len 1, h: 0008: ireturn
-        // .  
-           ac 
-        // parsed:, offset 236, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 238, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 240, len 0, h: end attributes[0] 
-// parsed:, offset 240, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 240, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 242, len 0, h:  attributes[0]: 
-    // parsed:, offset 242, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 244, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 248, len 2, h: source: utf8{"T_if_icmpge_5.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 250, len 0, h: end attributes[0] 
-// parsed:, offset 250, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5.j
deleted file mode 100644
index 30dbd29..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5.j
+++ /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_if_icmpge_5.java
-.class public dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmpge Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_5.java
deleted file mode 100644
index 4ea2d24..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_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 dxc.junit.opcodes.if_icmpge.jm;
-
-public class T_if_icmpge_5 {
-
-    public boolean run(int a, int b) {
-        return a >= b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6.cfh
deleted file mode 100644
index 4f67cf3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6.cfh
+++ /dev/null
@@ -1,204 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 8, h: 0004: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 55, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 64, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 70, len 3, h: 0007: type{dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_6}
-    // .  .  .  
-       07 00 0a 
-    // parsed:, offset 73, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0c 
-    // parsed:, offset 78, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 85, len 47, h: 000a: utf8{"dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  g  e  /  j  m  /  T  _  i  f  _  i  c  m  p  g  e  _  6  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 67 65 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 67 65 5f 36 
-    // parsed:, offset 132, len 21, h: 000b: utf8{"T_if_icmpge_6.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  g  e  _  6  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 67 65 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 153, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmpge.jm.T_if_icmpge_6}
-// .  .  
-   00 07 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:79,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:48,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 04 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 215, len 4, h: length: 00000018
-        // .  .  .  .  
-           00 00 00 18 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 0000000c
-        // .  .  .  .  
-           00 00 00 0c 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmpge 0008
-        // .  .  .  
-//@mod     a2 00 05    
-           a2 00 06 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 8, len 2, h: 0008: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 10, len 1, h: 000a: nop
-        // .  
-           00 
-        // parsed:, offset 11, len 1, h: 000b: ireturn
-        // .  
-           ac 
-        // parsed:, offset 239, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 241, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 243, len 0, h: end attributes[0] 
-// parsed:, offset 243, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 243, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 245, len 0, h:  attributes[0]: 
-    // parsed:, offset 245, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 247, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 251, len 2, h: source: utf8{"T_if_icmpge_6.java"}
-    // .  .  
-       00 0b 
-// parsed:, offset 253, len 0, h: end attributes[0] 
-// parsed:, offset 253, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6.j
deleted file mode 100644
index 35475dd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6.j
+++ /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_if_icmpge_6.java
-.class public dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmpge Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_6.java
deleted file mode 100644
index 3aafaba..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_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 dxc.junit.opcodes.if_icmpge.jm;
-
-public class T_if_icmpge_6 {
-
-    public boolean run(int a, int b) {
-        return a >= b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_7.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_7.j
deleted file mode 100644
index cf4e418..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_7.j
+++ /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_if_icmpge_7.java
-.class public dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    if_icmplt Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_7.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_7.java
deleted file mode 100644
index 8c98983..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpge/jm/T_if_icmpge_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 dxc.junit.opcodes.if_icmpge.jm;
-
-public class T_if_icmpge_7 {
-    
-    public boolean run(int a, int b) {
-        return a >= b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/Test_if_icmpgt.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/Test_if_icmpgt.java
deleted file mode 100644
index dd19bd9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/Test_if_icmpgt.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.if_icmpgt;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_1;
-
-public class Test_if_icmpgt extends DxTestCase {
-
-    /**
-     * @title  Arguments = 5, 6
-     */
-    public void testN1() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_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, 6));
-    }
-
-    /**
-     * @title  Arguments = 0x0f0e0d0c, 0x0f0e0d0c
-     */
-    public void testN2() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_1();
-        assertEquals(1234, t.run(0x0f0e0d0c, 0x0f0e0d0c));
-    }
-
-    /**
-     * @title  Arguments = 5, -5
-     */
-    public void testN3() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_1();
-        assertEquals(1, t.run(5, -5));
-    }
-
-    /**
-     * @title  Arguments = 0x0f0e0d0d, 0x0f0e0d0c
-     */
-    public void testN4() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_1();
-        assertEquals(1, t.run(0x0f0e0d0d, 0x0f0e0d0c));
-    }
-
-    /**
-     * @title  Arguments = 0x1234, 0x01001234
-     */
-    public void testN5() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_1();
-        assertEquals(1234, t.run(0x1234, 0x01001234));
-    }
-
-    /**
-     * @title  Arguments = -5, 5
-     */
-    public void testN6() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_1();
-        assertEquals(1234, t.run(-5, 5));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_1();
-        assertEquals(1234, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_1();
-        assertEquals(1234, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = 1234567, 0
-     */
-    public void testB3() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_1();
-        assertEquals(1, t.run(1234567, 0));
-    }
-
-    /**
-     * @title  Arguments = 0, 1234567
-     */
-    public void testB4() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_1();
-        assertEquals(1234, t.run(0, 1234567));
-    }
-
-    /**
-     * @title  Arguments = 0, 0
-     */
-    public void testB5() {
-        T_if_icmpgt_1 t = new T_if_icmpgt_1();
-        assertEquals(1234, t.run(0, 0));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_1.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_1.j
deleted file mode 100644
index 8e5abdc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_1.j
+++ /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_if_icmpgt_1.java
-.class public dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-    iload_2
-    
-    if_icmpgt Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_1.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_1.java
deleted file mode 100644
index 4cb1f12..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_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 dxc.junit.opcodes.if_icmpgt.jm;
-
-public class T_if_icmpgt_1 {
-
-    public int run(int a, int b) {
-        return a > b ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_2.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_2.j
deleted file mode 100644
index 75f8000..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_2.j
+++ /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_if_icmpgt_2.java
-.class public dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    if_icmpgt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_2.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_2.java
deleted file mode 100644
index bacaba5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_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 dxc.junit.opcodes.if_icmpgt.jm;
-
-public class T_if_icmpgt_2 {
-
-    public boolean run(int a, int b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_3.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_3.j
deleted file mode 100644
index 0fb8567..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_3.j
+++ /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_if_icmpgt_3.java
-.class public dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 4
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    dconst_1
-    if_icmpgt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_3.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_3.java
deleted file mode 100644
index 2791fc9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_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 dxc.junit.opcodes.if_icmpgt.jm;
-
-public class T_if_icmpgt_3 {
-
-    public boolean run(int a, int b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_4.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_4.j
deleted file mode 100644
index ae3796d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_4.j
+++ /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_if_icmpgt_4.java
-.class public dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-    iload_1
-    ;iload_2
-
-    if_icmpgt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_4.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_4.java
deleted file mode 100644
index 390bd08..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_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 dxc.junit.opcodes.if_icmpgt.jm;
-
-public class T_if_icmpgt_4 {
-
-    public boolean run(int a, int b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5.cfh
deleted file mode 100644
index 9909d78..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5.cfh
+++ /dev/null
@@ -1,197 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 47, h: 0003: utf8{"dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  g  t  /  j  m  /  T  _  i  f  _  i  c  m  p  g  t  _  5  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 67 74 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 67 74 5f 35 
-    // parsed:, offset 81, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 94, len 8, h: 0005: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 102, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 111, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 117, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0b 
-    // parsed:, offset 122, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 129, len 21, h: 000a: utf8{"T_if_icmpgt_5.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  g  t  _  5  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 67 74 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 150, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 156, len 3, h: 000c: type{dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_5}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_5}
-// .  .  
-   00 0c 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:76,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:45,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 215, len 4, h: length: 00000015
-        // .  .  .  .  
-           00 00 00 15 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 00000009
-        // .  .  .  .  
-           00 00 00 09 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmpgt 0007
-        // .  .  .  
-//@mod     a3 00 05    
-           a3 00 ff 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 8, len 1, h: 0008: ireturn
-        // .  
-           ac 
-        // parsed:, offset 236, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 238, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 240, len 0, h: end attributes[0] 
-// parsed:, offset 240, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 240, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 242, len 0, h:  attributes[0]: 
-    // parsed:, offset 242, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 244, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 248, len 2, h: source: utf8{"T_if_icmpgt_5.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 250, len 0, h: end attributes[0] 
-// parsed:, offset 250, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5.j
deleted file mode 100644
index b04cb99..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5.j
+++ /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_if_icmpgt_5.java
-.class public dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmpgt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_5.java
deleted file mode 100644
index 74f812f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_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 dxc.junit.opcodes.if_icmpgt.jm;
-
-public class T_if_icmpgt_5 {
-
-    public boolean run(int a, int b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6.cfh
deleted file mode 100644
index 1b032b5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6.cfh
+++ /dev/null
@@ -1,203 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 47, h: 0002: utf8{"dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  g  t  /  j  m  /  T  _  i  f  _  i  c  m  p  g  t  _  6  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 67 74 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 67 74 5f 36 
-    // parsed:, offset 62, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 81, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 94, len 8, h: 0005: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 102, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 111, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 117, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0a 
-    // parsed:, offset 122, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 129, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 135, len 3, h: 000b: type{dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_6}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 138, len 21, h: 000c: utf8{"T_if_icmpgt_6.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  g  t  _  6  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 67 74 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmpgt.jm.T_if_icmpgt_6}
-// .  .  
-   00 0b 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:79,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:48,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 215, len 4, h: length: 00000018
-        // .  .  .  .  
-           00 00 00 18 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 0000000c
-        // .  .  .  .  
-           00 00 00 0c 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmpgt 0008
-        // .  .  .  
-           a3 00 05 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 8, len 2, h: 0008: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 10, len 1, h: 000a: nop
-        // .  
-           00 
-        // parsed:, offset 11, len 1, h: 000b: ireturn
-        // .  
-           ac 
-        // parsed:, offset 239, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 241, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 243, len 0, h: end attributes[0] 
-// parsed:, offset 243, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 243, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 245, len 0, h:  attributes[0]: 
-    // parsed:, offset 245, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 247, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 251, len 2, h: source: utf8{"T_if_icmpgt_6.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 253, len 0, h: end attributes[0] 
-// parsed:, offset 253, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6.j
deleted file mode 100644
index 118b7c1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6.j
+++ /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_if_icmpgt_6.java
-.class public dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmpgt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_6.java
deleted file mode 100644
index 438ed36..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_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 dxc.junit.opcodes.if_icmpgt.jm;
-
-public class T_if_icmpgt_6 {
-
-    public boolean run(int a, int b) {
-        return a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_7.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_7.j
deleted file mode 100644
index f94e884..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_7.j
+++ /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_if_icmpgt_7.java
-.class public dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    if_icmple Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_7.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_7.java
deleted file mode 100644
index dce8480..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpgt/jm/T_if_icmpgt_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 dxc.junit.opcodes.if_icmpgt.jm;
-
-public class T_if_icmpgt_7 {
-    
-    public boolean run(int a, int b) {
-        return a > b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/Test_if_icmple.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/Test_if_icmple.java
deleted file mode 100644
index 11335e3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/Test_if_icmple.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.if_icmple;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.if_icmple.jm.T_if_icmple_1;
-
-public class Test_if_icmple extends DxTestCase {
-
-    /**
-     * @title  Arguments = 5, 6
-     */
-    public void testN1() {
-        T_if_icmple_1 t = new T_if_icmple_1();
-
-        assertEquals(1, t.run(5, 6));
-    }
-
-    /**
-     * @title  Arguments = 0x0f0e0d0c, 0x0f0e0d0c
-     */
-    public void testN2() {
-        T_if_icmple_1 t = new T_if_icmple_1();
-        assertEquals(1, t.run(0x0f0e0d0c, 0x0f0e0d0c));
-    }
-
-    /**
-     * @title  Arguments = 5, -5
-     */
-    public void testN3() {
-        T_if_icmple_1 t = new T_if_icmple_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, -5));
-    }
-
-    /**
-     * @title  Arguments = 0x0f0e0d0d, 0x0f0e0d0c
-     */
-    public void testN4() {
-        T_if_icmple_1 t = new T_if_icmple_1();
-        assertEquals(1234, t.run(0x0f0e0d0d, 0x0f0e0d0c));
-    }
-
-    /**
-     * @title  Arguments = 0x1234, 0x01001234
-     */
-    public void testN5() {
-        T_if_icmple_1 t = new T_if_icmple_1();
-        assertEquals(1, t.run(0x1234, 0x01001234));
-    }
-
-    /**
-     * @title  Arguments = -5, 5
-     */
-    public void testN6() {
-        T_if_icmple_1 t = new T_if_icmple_1();
-        assertEquals(1, t.run(-5, 5));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_if_icmple_1 t = new T_if_icmple_1();
-        assertEquals(1, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_if_icmple_1 t = new T_if_icmple_1();
-        assertEquals(1, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = 1234567, 0
-     */
-    public void testB3() {
-        T_if_icmple_1 t = new T_if_icmple_1();
-        assertEquals(1234, t.run(1234567, 0));
-    }
-
-    /**
-     * @title  Arguments = 0, 1234567
-     */
-    public void testB4() {
-        T_if_icmple_1 t = new T_if_icmple_1();
-        assertEquals(1, t.run(0, 1234567));
-    }
-
-    /**
-     * @title  Arguments = 0, 0
-     */
-    public void testB5() {
-        T_if_icmple_1 t = new T_if_icmple_1();
-        assertEquals(1, t.run(0, 0));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmple.jm.T_if_icmple_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmple.jm.T_if_icmple_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmple.jm.T_if_icmple_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmple.jm.T_if_icmple_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmple.jm.T_if_icmple_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmple.jm.T_if_icmple_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_1.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_1.j
deleted file mode 100644
index 14d7df0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_1.j
+++ /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_if_icmple_1.java
-.class public dxc/junit/opcodes/if_icmple/jm/T_if_icmple_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-    iload_2
-    
-    if_icmple Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_1.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_1.java
deleted file mode 100644
index 21f0339..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_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 dxc.junit.opcodes.if_icmple.jm;
-
-public class T_if_icmple_1 {
-
-    public int run(int a, int b) {
-        return a <= b ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_2.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_2.j
deleted file mode 100644
index d4c8db7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_2.j
+++ /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_if_icmple_2.java
-.class public dxc/junit/opcodes/if_icmple/jm/T_if_icmple_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    if_icmple Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_2.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_2.java
deleted file mode 100644
index d426d43..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_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 dxc.junit.opcodes.if_icmple.jm;
-
-public class T_if_icmple_2 {
-
-    public boolean run(int a, int b) {
-        return a <= b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_3.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_3.j
deleted file mode 100644
index f2da81e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_3.j
+++ /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_if_icmple_3.java
-.class public dxc/junit/opcodes/if_icmple/jm/T_if_icmple_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 4
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    dconst_1
-    if_icmple Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_3.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_3.java
deleted file mode 100644
index 76b5458..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_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 dxc.junit.opcodes.if_icmple.jm;
-
-public class T_if_icmple_3 {
-
-    public boolean run(int a, int b) {
-        return a <= b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_4.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_4.j
deleted file mode 100644
index 1a6368b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_4.j
+++ /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_if_icmple_4.java
-.class public dxc/junit/opcodes/if_icmple/jm/T_if_icmple_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-    iload_1
-    ;iload_2
-
-    if_icmple Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_4.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_4.java
deleted file mode 100644
index b530f67..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_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 dxc.junit.opcodes.if_icmple.jm;
-
-public class T_if_icmple_4 {
-
-    public boolean run(int a, int b) {
-        return a <= b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5.cfh
deleted file mode 100644
index e83f3b0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5.cfh
+++ /dev/null
@@ -1,197 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 3, h: 0003: type{dxc.junit.opcodes.if_icmple.jm.T_if_icmple_5}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 37, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 50, len 8, h: 0005: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 58, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 67, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 73, len 47, h: 0008: utf8{"dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  l  e  /  j  m  /  T  _  i  f  _  i  c  m  p  l  e  _  5  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 6c 65 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 6c 65 5f 35 
-    // parsed:, offset 120, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0c 
-    // parsed:, offset 125, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 132, len 21, h: 000b: utf8{"T_if_icmple_5.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  l  e  _  5  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 6c 65 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 153, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmple.jm.T_if_icmple_5}
-// .  .  
-   00 03 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:76,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:45,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 215, len 4, h: length: 00000015
-        // .  .  .  .  
-           00 00 00 15 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 00000009
-        // .  .  .  .  
-           00 00 00 09 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmple 0007
-        // .  .  .  
-//@mod     a4 00 05    
-           a4 00 ff 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 8, len 1, h: 0008: ireturn
-        // .  
-           ac 
-        // parsed:, offset 236, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 238, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 240, len 0, h: end attributes[0] 
-// parsed:, offset 240, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 240, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 242, len 0, h:  attributes[0]: 
-    // parsed:, offset 242, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 244, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 248, len 2, h: source: utf8{"T_if_icmple_5.java"}
-    // .  .  
-       00 0b 
-// parsed:, offset 250, len 0, h: end attributes[0] 
-// parsed:, offset 250, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5.j
deleted file mode 100644
index 3aacfb3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5.j
+++ /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_if_icmple_5.java
-.class public dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmple Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_5.java
deleted file mode 100644
index 09a7272..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_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 dxc.junit.opcodes.if_icmple.jm;
-
-public class T_if_icmple_5 {
-
-    public boolean run(int a, int b) {
-        return a <= b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6.cfh
deleted file mode 100644
index 7f734e7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6.cfh
+++ /dev/null
@@ -1,204 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 09 
-    // parsed:, offset 15, len 3, h: 0002: type{dxc.junit.opcodes.if_icmple.jm.T_if_icmple_6}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 18, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 37, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 50, len 8, h: 0005: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 58, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 67, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 73, len 47, h: 0008: utf8{"dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  l  e  /  j  m  /  T  _  i  f  _  i  c  m  p  l  e  _  6  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 6c 65 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 6c 65 5f 36 
-    // parsed:, offset 120, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0b 
-    // parsed:, offset 125, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 132, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 138, len 21, h: 000c: utf8{"T_if_icmple_6.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  l  e  _  6  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 6c 65 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmple.jm.T_if_icmple_6}
-// .  .  
-   00 02 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:79,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:48,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 215, len 4, h: length: 00000018
-        // .  .  .  .  
-           00 00 00 18 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 0000000c
-        // .  .  .  .  
-           00 00 00 0c 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmple 0008
-        // .  .  .  
-//@mod     a4 00 05    
-           a4 00 06 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 8, len 2, h: 0008: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 10, len 1, h: 000a: nop
-        // .  
-           00 
-        // parsed:, offset 11, len 1, h: 000b: ireturn
-        // .  
-           ac 
-        // parsed:, offset 239, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 241, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 243, len 0, h: end attributes[0] 
-// parsed:, offset 243, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 243, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 245, len 0, h:  attributes[0]: 
-    // parsed:, offset 245, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 247, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 251, len 2, h: source: utf8{"T_if_icmple_6.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 253, len 0, h: end attributes[0] 
-// parsed:, offset 253, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6.j
deleted file mode 100644
index f8c5961..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6.j
+++ /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_if_icmple_6.java
-.class public dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmple Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_6.java
deleted file mode 100644
index 9152a6f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_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 dxc.junit.opcodes.if_icmple.jm;
-
-public class T_if_icmple_6 {
-
-    public boolean run(int a, int b) {
-        return a <= b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_7.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_7.j
deleted file mode 100644
index 13ebcb5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_7.j
+++ /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_if_icmple_7.java
-.class public dxc/junit/opcodes/if_icmple/jm/T_if_icmple_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    if_icmpgt Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_7.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_7.java
deleted file mode 100644
index 1080ee2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmple/jm/T_if_icmple_7.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 dxc.junit.opcodes.if_icmple.jm;
-
-public class T_if_icmple_7 {
-    public boolean run(int a, int b) {
-        return a <= b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/Test_if_icmplt.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/Test_if_icmplt.java
deleted file mode 100644
index b318512..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/Test_if_icmplt.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.if_icmplt;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_1;
-
-public class Test_if_icmplt extends DxTestCase {
-
-    /**
-     * @title  Arguments = 5, 6
-     */
-    public void testN1() {
-        T_if_icmplt_1 t = new T_if_icmplt_1();
-        assertEquals(1, t.run(5, 6));
-    }
-
-    /**
-     * @title  Arguments = 0x0f0e0d0c, 0x0f0e0d0c
-     */
-    public void testN2() {
-        T_if_icmplt_1 t = new T_if_icmplt_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(0x0f0e0d0c, 0x0f0e0d0c));
-    }
-
-    /**
-     * @title  Arguments = 5, -5
-     */
-    public void testN3() {
-        T_if_icmplt_1 t = new T_if_icmplt_1();
-        assertEquals(1234, t.run(5, -5));
-    }
-
-    /**
-     * @title  Arguments = 0x0f0e0d0d, 0x0f0e0d0c
-     */
-    public void testN4() {
-        T_if_icmplt_1 t = new T_if_icmplt_1();
-        assertEquals(1234, t.run(0x0f0e0d0d, 0x0f0e0d0c));
-    }
-
-    /**
-     * @title  Arguments = 0x1234, 0x01001234
-     */
-    public void testN5() {
-        T_if_icmplt_1 t = new T_if_icmplt_1();
-        assertEquals(1, t.run(0x1234, 0x01001234));
-    }
-
-    /**
-     * @title  Arguments = -5, 5
-     */
-    public void testN6() {
-        T_if_icmplt_1 t = new T_if_icmplt_1();
-        assertEquals(1, t.run(-5, 5));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_if_icmplt_1 t = new T_if_icmplt_1();
-        assertEquals(1234, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_if_icmplt_1 t = new T_if_icmplt_1();
-        assertEquals(1234, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = 1234567, 0
-     */
-    public void testB3() {
-        T_if_icmplt_1 t = new T_if_icmplt_1();
-        assertEquals(1234, t.run(1234567, 0));
-    }
-
-    /**
-     * @title  Arguments = 0, 1234567
-     */
-    public void testB4() {
-        T_if_icmplt_1 t = new T_if_icmplt_1();
-        assertEquals(1, t.run(0, 1234567));
-    }
-
-    /**
-     * @title  Arguments = 0, 0
-     */
-    public void testB5() {
-        T_if_icmplt_1 t = new T_if_icmplt_1();
-        assertEquals(1234, t.run(0, 0));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_1.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_1.j
deleted file mode 100644
index 91b3ef6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_1.j
+++ /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_if_icmpge_1.java
-.class public dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-    iload_2
-    
-    if_icmplt Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_1.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_1.java
deleted file mode 100644
index 5cf6dfa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_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 dxc.junit.opcodes.if_icmplt.jm;
-
-public class T_if_icmplt_1 {
-
-    public int run(int a, int b) {
-        return a < b ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_2.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_2.j
deleted file mode 100644
index a2c9d4c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_2.j
+++ /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_if_icmplt_2.java
-.class public dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    if_icmplt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_2.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_2.java
deleted file mode 100644
index 5c557a0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_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 dxc.junit.opcodes.if_icmplt.jm;
-
-public class T_if_icmplt_2 {
-
-    public boolean run(int a, int b) {
-        return a < b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_3.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_3.j
deleted file mode 100644
index 0b80fdc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_3.j
+++ /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_if_icmplt_3.java
-.class public dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 4
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    dconst_1
-    if_icmplt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_3.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_3.java
deleted file mode 100644
index 210bfdf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_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 dxc.junit.opcodes.if_icmplt.jm;
-
-public class T_if_icmplt_3 {
-
-    public boolean run(int a, int b) {
-        return a < b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_4.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_4.j
deleted file mode 100644
index fdf43d5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_4.j
+++ /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_if_icmplt_4.java
-.class public dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-    iload_1
-    ;iload_2
-
-    if_icmplt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_4.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_4.java
deleted file mode 100644
index 323c06c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_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 dxc.junit.opcodes.if_icmplt.jm;
-
-public class T_if_icmplt_4 {
-
-    public boolean run(int a, int b) {
-        return a < b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5.cfh
deleted file mode 100644
index 96d6e1c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5.cfh
+++ /dev/null
@@ -1,197 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 8, h: 0004: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 55, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 64, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 70, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0a 
-    // parsed:, offset 75, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 82, len 3, h: 0009: type{dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_5}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 85, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 91, len 47, h: 000b: utf8{"dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  l  t  /  j  m  /  T  _  i  f  _  i  c  m  p  l  t  _  5  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 6c 74 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 6c 74 5f 35 
-    // parsed:, offset 138, len 21, h: 000c: utf8{"T_if_icmplt_5.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  l  t  _  5  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 6c 74 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_5}
-// .  .  
-   00 09 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:76,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:45,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 04 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 215, len 4, h: length: 00000015
-        // .  .  .  .  
-           00 00 00 15 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 00000009
-        // .  .  .  .  
-           00 00 00 09 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmplt 00ff
-        // .  .  .  
-//@mod     a1 00 05    
-           a1 00 ff 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 8, len 1, h: 0008: ireturn
-        // .  
-           ac 
-        // parsed:, offset 236, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 238, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 240, len 0, h: end attributes[0] 
-// parsed:, offset 240, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 240, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 242, len 0, h:  attributes[0]: 
-    // parsed:, offset 242, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 244, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 248, len 2, h: source: utf8{"T_if_icmplt_5.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 250, len 0, h: end attributes[0] 
-// parsed:, offset 250, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5.j
deleted file mode 100644
index 3a8cd46..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5.j
+++ /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_if_icmplt_5.java
-.class public dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmplt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_5.java
deleted file mode 100644
index 426cfbb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_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 dxc.junit.opcodes.if_icmplt.jm;
-
-public class T_if_icmplt_5 {
-
-    public boolean run(int a, int b) {
-        return a < b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6.cfh
deleted file mode 100644
index 7722c6b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6.cfh
+++ /dev/null
@@ -1,204 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 21, h: 0003: utf8{"T_if_icmplt_6.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  l  t  _  6  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 6c 74 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 55, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 68, len 8, h: 0005: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 76, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 85, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 91, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0b 
-    // parsed:, offset 96, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 103, len 3, h: 000a: type{dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_6}
-    // .  .  .  
-       07 00 0c 
-    // parsed:, offset 106, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 112, len 47, h: 000c: utf8{"dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  l  t  /  j  m  /  T  _  i  f  _  i  c  m  p  l  t  _  6  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 6c 74 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 6c 74 5f 36 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmplt.jm.T_if_icmplt_6}
-// .  .  
-   00 0a 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:79,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:48,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 215, len 4, h: length: 00000018
-        // .  .  .  .  
-           00 00 00 18 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 0000000c
-        // .  .  .  .  
-           00 00 00 0c 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmplt 0008
-        // .  .  .  
-//@mod     a1 00 05    
-           a1 00 06 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 8, len 2, h: 0008: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 10, len 1, h: 000a: nop
-        // .  
-           00 
-        // parsed:, offset 11, len 1, h: 000b: ireturn
-        // .  
-           ac 
-        // parsed:, offset 239, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 241, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 243, len 0, h: end attributes[0] 
-// parsed:, offset 243, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 243, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 245, len 0, h:  attributes[0]: 
-    // parsed:, offset 245, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 247, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 251, len 2, h: source: utf8{"T_if_icmplt_6.java"}
-    // .  .  
-       00 03 
-// parsed:, offset 253, len 0, h: end attributes[0] 
-// parsed:, offset 253, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6.j
deleted file mode 100644
index e0e56f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6.j
+++ /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_if_icmplt_6.java
-.class public dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmplt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_6.java
deleted file mode 100644
index 8f5f94c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_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 dxc.junit.opcodes.if_icmplt.jm;
-
-public class T_if_icmplt_6 {
-
-    public boolean run(int a, int b) {
-        return a < b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_7.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_7.j
deleted file mode 100644
index b702a2d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_7.j
+++ /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_if_icmplt_7.java
-.class public dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    if_icmpge Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_7.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_7.java
deleted file mode 100644
index b3cbb72..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmplt/jm/T_if_icmplt_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 dxc.junit.opcodes.if_icmplt.jm;
-
-public class T_if_icmplt_7 {
-    
-    public boolean run(int a, int b) {
-        return a < b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/Test_if_icmpne.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/Test_if_icmpne.java
deleted file mode 100644
index db62187..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/Test_if_icmpne.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 dxc.junit.opcodes.if_icmpne;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_1;
-
-public class Test_if_icmpne extends DxTestCase {
-
-    /**
-     * @title  Arguments = 5, 6
-     */
-    public void testN1() {
-        T_if_icmpne_1 t = new T_if_icmpne_1();
-        assertEquals(1, t.run(5, 6));
-    }
-
-    /**
-     * @title  Arguments = 0x0f0e0d0c, 0x0f0e0d0c
-     */
-    public void testN2() {
-        T_if_icmpne_1 t = new T_if_icmpne_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(0x0f0e0d0c, 0x0f0e0d0c));
-    }
-
-    /**
-     * @title  Arguments = 5, -5
-     */
-    public void testN3() {
-        T_if_icmpne_1 t = new T_if_icmpne_1();
-        assertEquals(1, t.run(5, -5));
-    }
-
-    /**
-     * @title  Arguments = 0x01001234, 0x1234
-     */
-    public void testN4() {
-        T_if_icmpne_1 t = new T_if_icmpne_1();
-        assertEquals(1, t.run(0x01001234, 0x1234));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_if_icmpne_1 t = new T_if_icmpne_1();
-        assertEquals(1234, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE, Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_if_icmpne_1 t = new T_if_icmpne_1();
-        assertEquals(1234, t.run(Integer.MIN_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = 0, 1234567
-     */
-    public void testB3() {
-        T_if_icmpne_1 t = new T_if_icmpne_1();
-        assertEquals(1, t.run(0, 1234567));
-    }
-
-    /**
-     * @title  Arguments = 0, 0
-     */
-    public void testB4() {
-        T_if_icmpne_1 t = new T_if_icmpne_1();
-        assertEquals(1234, t.run(0, 0));
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_1.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_1.j
deleted file mode 100644
index b5aba30..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_1.j
+++ /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_if_icmpne_1.java
-.class public dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-    iload_2
-    
-    if_icmpne Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_1.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_1.java
deleted file mode 100644
index ea94397..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_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 dxc.junit.opcodes.if_icmpne.jm;
-
-public class T_if_icmpne_1 {
-
-    public int run(int a, int b) {
-        return a != b ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_2.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_2.j
deleted file mode 100644
index 60a57ef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_2.j
+++ /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_if_icmpne_2.java
-.class public dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    if_icmpne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_2.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_2.java
deleted file mode 100644
index 2d83a4a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_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 dxc.junit.opcodes.if_icmpne.jm;
-
-public class T_if_icmpne_2 {
-
-    public boolean run(int a, int b) {
-        return a != b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_3.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_3.j
deleted file mode 100644
index eb4f44c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_3.j
+++ /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_if_icmpne_3.java
-.class public dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 4
-    .limit locals 3
-
-    iload_1
-;    iload_2
-    dconst_1
-    if_icmpne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_3.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_3.java
deleted file mode 100644
index 2b53702..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_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 dxc.junit.opcodes.if_icmpne.jm;
-
-public class T_if_icmpne_3 {
-
-    public boolean run(int a, int b) {
-        return a != b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_4.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_4.j
deleted file mode 100644
index 92c5f2d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_4.j
+++ /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_if_icmpne_4.java
-.class public dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-    iload_1
-    ;iload_2
-
-    if_icmpne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_4.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_4.java
deleted file mode 100644
index beb6454..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_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 dxc.junit.opcodes.if_icmpne.jm;
-
-public class T_if_icmpne_4 {
-
-    public boolean run(int a, int b) {
-        return a != b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5.cfh
deleted file mode 100644
index f0acc92..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5.cfh
+++ /dev/null
@@ -1,197 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 8, h: 0004: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 55, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 64, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 70, len 21, h: 0007: utf8{"T_if_icmpne_5.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  n  e  _  5  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 6e 65 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 91, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 96, len 47, h: 0009: utf8{"dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  n  e  /  j  m  /  T  _  i  f  _  i  c  m  p  n  e  _  5  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 6e 65 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 6e 65 5f 35 
-    // parsed:, offset 143, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 150, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 156, len 3, h: 000c: type{dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_5}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_5}
-// .  .  
-   00 0c 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:76,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:45,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 04 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 215, len 4, h: length: 00000015
-        // .  .  .  .  
-           00 00 00 15 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 00000009
-        // .  .  .  .  
-           00 00 00 09 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmpne 00ff
-        // .  .  .  
-//@mod     a0 00 05    
-           a0 00 ff 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 8, len 1, h: 0008: ireturn
-        // .  
-           ac 
-        // parsed:, offset 236, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 238, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 240, len 0, h: end attributes[0] 
-// parsed:, offset 240, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 240, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 242, len 0, h:  attributes[0]: 
-    // parsed:, offset 242, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 244, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 248, len 2, h: source: utf8{"T_if_icmpne_5.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 250, len 0, h: end attributes[0] 
-// parsed:, offset 250, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5.j
deleted file mode 100644
index 74d20f3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5.j
+++ /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_if_icmpne_5.java
-.class public dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmpne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_5.java
deleted file mode 100644
index 157e7f2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_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 dxc.junit.opcodes.if_icmpne.jm;
-
-public class T_if_icmpne_5 {
-
-    public boolean run(int a, int b) {
-        return a != b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6.cfh
deleted file mode 100644
index 1991416..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6.cfh
+++ /dev/null
@@ -1,204 +0,0 @@
-//@class:dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 8, h: 0004: utf8{"(II)Z"}
-    // .  .  .  (  I  I  )  Z  
-       01 00 05 28 49 49 29 5a 
-    // parsed:, offset 55, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 64, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 70, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 75, len 47, h: 0008: utf8{"dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  _  i  c  m  p  n  e  /  j  m  /  T  _  i  f  _  i  c  m  p  n  e  _  6  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 5f 69 63 6d 70 6e 65 2f 6a 6d 2f 54 5f 69 66 5f 69 63 6d 70 6e 65 5f 36 
-    // parsed:, offset 122, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 129, len 21, h: 000a: utf8{"T_if_icmpne_6.java"}
-    // .  .  .  T  _  i  f  _  i  c  m  p  n  e  _  6  .  j  a  v  a  
-       01 00 12 54 5f 69 66 5f 69 63 6d 70 6e 65 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 150, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 156, len 3, h: 000c: type{dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_6}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 159, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.if_icmpne.jm.T_if_icmpne_6}
-// .  .  
-   00 0c 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:79,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:48,desc: (II)Z
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 209, len 2, h: descriptor: (II)Z
-    // .  .  
-       00 04 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 215, len 4, h: length: 00000018
-        // .  .  .  .  
-           00 00 00 18 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 223, len 4, h: code_length: 0000000c
-        // .  .  .  .  
-           00 00 00 0c 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 3, h: 0002: if_icmpne 0008
-        // .  .  .  
-//@mod     a0 00 05    
-           a0 00 06 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 8, len 2, h: 0008: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 10, len 1, h: 000a: nop
-        // .  
-           00 
-        // parsed:, offset 11, len 1, h: 000b: ireturn
-        // .  
-           ac 
-        // parsed:, offset 239, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 241, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 243, len 0, h: end attributes[0] 
-// parsed:, offset 243, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (II)Z
-// parsed:, offset 243, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 245, len 0, h:  attributes[0]: 
-    // parsed:, offset 245, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 247, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 251, len 2, h: source: utf8{"T_if_icmpne_6.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 253, len 0, h: end attributes[0] 
-// parsed:, offset 253, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6.j
deleted file mode 100644
index 2344281..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6.j
+++ /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_if_icmpne_6.java
-.class public dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    if_icmpne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_6.java
deleted file mode 100644
index c0ed691..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_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 dxc.junit.opcodes.if_icmpne.jm;
-
-public class T_if_icmpne_6 {
-
-    public boolean run(int a, int b) {
-        return a != b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_7.j b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_7.j
deleted file mode 100644
index b17f2de..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_7.j
+++ /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_if_icmpne_7.java
-.class public dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    if_icmpeq Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_7.java b/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_7.java
deleted file mode 100644
index 6d777ca..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/if_icmpne/jm/T_if_icmpne_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 dxc.junit.opcodes.if_icmpne.jm;
-
-public class T_if_icmpne_7 {
-    
-    public boolean run(int a, int b) {
-        return a != b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/Test_ifeq.java b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/Test_ifeq.java
deleted file mode 100644
index 3927098..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/Test_ifeq.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 dxc.junit.opcodes.ifeq;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ifeq.jm.T_ifeq_1;
-
-public class Test_ifeq extends DxTestCase {
-
-    /**
-     * @title  Argument = 5
-     */
-    public void testN1() {
-        T_ifeq_1 t = new T_ifeq_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));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testN2() {
-        T_ifeq_1 t = new T_ifeq_1();
-        assertEquals(1, t.run(0));
-    }
-
-    /**
-     * @title  Arguments = -5
-     */
-    public void testN3() {
-        T_ifeq_1 t = new T_ifeq_1();
-        assertEquals(1234, t.run(-5));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_ifeq_1 t = new T_ifeq_1();
-        assertEquals(1234, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_ifeq_1 t = new T_ifeq_1();
-        assertEquals(1234, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifeq.jm.T_ifeq_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifeq.jm.T_ifeq_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifeq.jm.T_ifeq_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifeq.jm.T_ifeq_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifeq.jm.T_ifeq_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifeq.jm.T_ifeq_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_1.j
deleted file mode 100644
index ebbf58d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_1.j
+++ /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_ifeq_1.java
-.class public dxc/junit/opcodes/ifeq/jm/T_ifeq_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(I)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-   
-    ifeq Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_1.java
deleted file mode 100644
index 4fbd9fe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_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 dxc.junit.opcodes.ifeq.jm;
-
-public class T_ifeq_1 {
-
-    public int run(int a) {
-        return a == 0 ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_2.j
deleted file mode 100644
index 55b0609..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_2.j
+++ /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_ifeq_2.java
-.class public dxc/junit/opcodes/ifeq/jm/T_ifeq_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-;    iload_1
-    ifeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_2.java
deleted file mode 100644
index 86c487b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_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 dxc.junit.opcodes.ifeq.jm;
-
-public class T_ifeq_2 {
-
-    public boolean run(int a) {
-        return a == 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_3.j
deleted file mode 100644
index 0d57e2f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_3.j
+++ /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_ifeq_3.java
-.class public dxc/junit/opcodes/ifeq/jm/T_ifeq_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 4
-    .limit locals 3
-
-;    iload_1
-    dconst_1
-    ifeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_3.java
deleted file mode 100644
index c511d7f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_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 dxc.junit.opcodes.ifeq.jm;
-
-public class T_ifeq_3 {
-
-    public boolean run(int a) {
-        return a == 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_4.j
deleted file mode 100644
index 0d3cbb5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_4.j
+++ /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_ifeq_4.java
-.class public dxc/junit/opcodes/ifeq/jm/T_ifeq_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1
-
-    ifeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_4.java
deleted file mode 100644
index ca0acbb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_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 dxc.junit.opcodes.ifeq.jm;
-
-public class T_ifeq_4 {
-
-    public boolean run(int a) {
-        return a == 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_5.cfh
deleted file mode 100644
index cc71d99..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/ifeq/jm/T_ifeq_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 7, h: 0005: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 63, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 69, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0a 
-    // parsed:, offset 74, len 37, h: 0008: utf8{"dxc/junit/opcodes/ifeq/jm/T_ifeq_5"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  e  q  /  j  m  /  T  _  i  f  e  q  _  5  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 65 71 2f 6a 6d 2f 54 5f 69 66 65 71 5f 35 
-    // parsed:, offset 111, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 118, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 124, len 3, h: 000b: type{dxc.junit.opcodes.ifeq.jm.T_ifeq_5}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 127, len 16, h: 000c: utf8{"T_ifeq_5.java"}
-    // .  .  .  T  _  i  f  e  q  _  5  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 65 71 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.ifeq.jm.T_ifeq_5}
-// .  .  
-   00 0b 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:75,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:44,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 199, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: ifeq 0006
-        // .  .  .  
-//@mod     99 00 05    
-           99 00 ff 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 7, len 1, h: 0007: ireturn
-        // .  
-           ac 
-        // parsed:, offset 219, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 221, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 223, len 0, h: end attributes[0] 
-// parsed:, offset 223, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 223, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 225, len 0, h:  attributes[0]: 
-    // parsed:, offset 225, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 227, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 231, len 2, h: source: utf8{"T_ifeq_5.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 233, len 0, h: end attributes[0] 
-// parsed:, offset 233, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_5.j
deleted file mode 100644
index 004f71c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_5.j
+++ /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_ifeq_5.java
-.class public dxc/junit/opcodes/ifeq/jm/T_ifeq_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    ifeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_5.java
deleted file mode 100644
index 3ed3f25..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_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 dxc.junit.opcodes.ifeq.jm;
-
-public class T_ifeq_5 {
-
-    public boolean run(int a) {
-        return a == 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_6.cfh
deleted file mode 100644
index 32cd5c3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_6.cfh
+++ /dev/null
@@ -1,201 +0,0 @@
-//@class:dxc/junit/opcodes/ifeq/jm/T_ifeq_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 16, h: 0005: utf8{"T_ifeq_6.java"}
-    // .  .  .  T  _  i  f  e  q  _  6  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 65 71 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 72, len 7, h: 0006: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 79, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 85, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0b 
-    // parsed:, offset 90, len 37, h: 0009: utf8{"dxc/junit/opcodes/ifeq/jm/T_ifeq_6"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  e  q  /  j  m  /  T  _  i  f  e  q  _  6  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 65 71 2f 6a 6d 2f 54 5f 69 66 65 71 5f 36 
-    // parsed:, offset 127, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 134, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 140, len 3, h: 000c: type{dxc.junit.opcodes.ifeq.jm.T_ifeq_6}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.ifeq.jm.T_ifeq_6}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:78,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:47,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 06 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 199, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: ifeq 0007
-        // .  .  .  
-//@mod     99 00 05    
-           99 00 06 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 7, len 2, h: 0007: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 9, len 1, h: 0009: nop
-        // .  
-           00 
-        // parsed:, offset 10, len 1, h: 000a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 222, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 224, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 226, len 0, h: end attributes[0] 
-// parsed:, offset 226, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 226, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 228, len 0, h:  attributes[0]: 
-    // parsed:, offset 228, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 230, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 234, len 2, h: source: utf8{"T_ifeq_6.java"}
-    // .  .  
-       00 05 
-// parsed:, offset 236, len 0, h: end attributes[0] 
-// parsed:, offset 236, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_6.j
deleted file mode 100644
index 03b9e49..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_6.j
+++ /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_ifeq_6.java
-.class public dxc/junit/opcodes/ifeq/jm/T_ifeq_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    ifeq Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_6.java
deleted file mode 100644
index be53931..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_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 dxc.junit.opcodes.ifeq.jm;
-
-public class T_ifeq_6 {
-
-    public boolean run(int a) {
-        return a == 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_7.j b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_7.j
deleted file mode 100644
index 44eb855..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_7.j
+++ /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_ifeq_7.java
-.class public dxc/junit/opcodes/ifeq/jm/T_ifeq_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)Z
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_7.java b/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_7.java
deleted file mode 100644
index 3bca0e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifeq/jm/T_ifeq_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 dxc.junit.opcodes.ifeq.jm;
-
-public class T_ifeq_7 {
-    
-    public boolean run(int a) {
-        return a == 0;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/Test_ifge.java b/tools/dx-tests/src/dxc/junit/opcodes/ifge/Test_ifge.java
deleted file mode 100644
index f5ce7d4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/Test_ifge.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 dxc.junit.opcodes.ifge;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ifge.jm.T_ifge_1;
-
-public class Test_ifge extends DxTestCase {
-
-    /**
-     * @title  Argument = 5
-     */
-    public void testN1() {
-        T_ifge_1 t = new T_ifge_1();
-        assertEquals(1, t.run(5));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testN2() {
-        T_ifge_1 t = new T_ifge_1();
-        assertEquals(1, t.run(0));
-    }
-
-    /**
-     * @title  Arguments = -5
-     */
-    public void testN3() {
-        T_ifge_1 t = new T_ifge_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));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_ifge_1 t = new T_ifge_1();
-        assertEquals(1, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_ifge_1 t = new T_ifge_1();
-        assertEquals(1234, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifge.jm.T_ifge_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifge.jm.T_ifge_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifge.jm.T_ifge_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifge.jm.T_ifge_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifge.jm.T_ifge_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifge.jm.T_ifge_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_1.j
deleted file mode 100644
index 5e1064e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_1.j
+++ /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_ifge_1.java
-.class public dxc/junit/opcodes/ifge/jm/T_ifge_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(I)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-   
-    ifge Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_1.java
deleted file mode 100644
index f7f00c4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_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 dxc.junit.opcodes.ifge.jm;
-
-public class T_ifge_1 {
-
-    public int run(int a) {
-        return a >= 0 ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_2.j
deleted file mode 100644
index 2fa1d3b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_2.j
+++ /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_ifge_2.java
-.class public dxc/junit/opcodes/ifge/jm/T_ifge_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-;    iload_1
-    ifge Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_2.java
deleted file mode 100644
index 3531b63..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_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 dxc.junit.opcodes.ifge.jm;
-
-public class T_ifge_2 {
-
-    public boolean run(int a) {
-        return a >= 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_3.j
deleted file mode 100644
index ed463c0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_3.j
+++ /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_ifge_3.java
-.class public dxc/junit/opcodes/ifge/jm/T_ifge_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 4
-    .limit locals 3
-
-;    iload_1
-    dconst_1
-    ifge Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_3.java
deleted file mode 100644
index d41e72f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_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 dxc.junit.opcodes.ifge.jm;
-
-public class T_ifge_3 {
-
-    public boolean run(int a) {
-        return a >= 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_4.j
deleted file mode 100644
index c8931a9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_4.j
+++ /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_ifge_4.java
-.class public dxc/junit/opcodes/ifge/jm/T_ifge_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-;    iload_1
-
-    ifge Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_4.java
deleted file mode 100644
index c2f54c3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_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 dxc.junit.opcodes.ifge.jm;
-
-public class T_ifge_4 {
-
-    public boolean run(int a) {
-        return a >= 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_5.cfh
deleted file mode 100644
index 447a6d0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/ifge/jm/T_ifge_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 16, h: 0002: utf8{"T_ifge_5.java"}
-    // .  .  .  T  _  i  f  g  e  _  5  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 67 65 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 31, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 50, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 63, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 72, len 7, h: 0006: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 79, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 85, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 90, len 37, h: 0009: utf8{"dxc/junit/opcodes/ifge/jm/T_ifge_5"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  g  e  /  j  m  /  T  _  i  f  g  e  _  5  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 67 65 2f 6a 6d 2f 54 5f 69 66 67 65 5f 35 
-    // parsed:, offset 127, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 134, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 140, len 3, h: 000c: type{dxc.junit.opcodes.ifge.jm.T_ifge_5}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.ifge.jm.T_ifge_5}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:75,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:44,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 06 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 199, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: ifge 00ff
-        // .  .  .  
-//@mod     9c 00 05    
-           9c 00 ff 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 7, len 1, h: 0007: ireturn
-        // .  
-           ac 
-        // parsed:, offset 219, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 221, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 223, len 0, h: end attributes[0] 
-// parsed:, offset 223, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 223, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 225, len 0, h:  attributes[0]: 
-    // parsed:, offset 225, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 227, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 231, len 2, h: source: utf8{"T_ifge_5.java"}
-    // .  .  
-       00 02 
-// parsed:, offset 233, len 0, h: end attributes[0] 
-// parsed:, offset 233, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_5.j
deleted file mode 100644
index fa04b63..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_5.j
+++ /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_ifge_5.java
-.class public dxc/junit/opcodes/ifge/jm/T_ifge_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    ifge Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_5.java
deleted file mode 100644
index 51b8426..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_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 dxc.junit.opcodes.ifge.jm;
-
-public class T_ifge_5 {
-
-    public boolean run(int a) {
-        return a >= 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_6.cfh
deleted file mode 100644
index ed3e960..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_6.cfh
+++ /dev/null
@@ -1,201 +0,0 @@
-//@class:dxc/junit/opcodes/ifge/jm/T_ifge_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 7, h: 0005: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 63, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 69, len 37, h: 0007: utf8{"dxc/junit/opcodes/ifge/jm/T_ifge_6"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  g  e  /  j  m  /  T  _  i  f  g  e  _  6  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 67 65 2f 6a 6d 2f 54 5f 69 66 67 65 5f 36 
-    // parsed:, offset 106, len 16, h: 0008: utf8{"T_ifge_6.java"}
-    // .  .  .  T  _  i  f  g  e  _  6  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 67 65 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 122, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0b 
-    // parsed:, offset 127, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 134, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 140, len 3, h: 000c: type{dxc.junit.opcodes.ifge.jm.T_ifge_6}
-    // .  .  .  
-       07 00 07 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.ifge.jm.T_ifge_6}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:78,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:47,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 199, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: ifge 0007
-        // .  .  .  
-//@mod     9c 00 05    
-           9c 00 06 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 7, len 2, h: 0007: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 9, len 1, h: 0009: nop
-        // .  
-           00 
-        // parsed:, offset 10, len 1, h: 000a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 222, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 224, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 226, len 0, h: end attributes[0] 
-// parsed:, offset 226, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 226, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 228, len 0, h:  attributes[0]: 
-    // parsed:, offset 228, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 230, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 234, len 2, h: source: utf8{"T_ifge_6.java"}
-    // .  .  
-       00 08 
-// parsed:, offset 236, len 0, h: end attributes[0] 
-// parsed:, offset 236, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_6.j
deleted file mode 100644
index be4599c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_6.j
+++ /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_ifge_6.java
-.class public dxc/junit/opcodes/ifge/jm/T_ifge_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    ifge Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_6.java
deleted file mode 100644
index fef5eda..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_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 dxc.junit.opcodes.ifge.jm;
-
-public class T_ifge_6 {
-
-    public boolean run(int a) {
-        return a >= 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_7.j b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_7.j
deleted file mode 100644
index 90f73f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_7.j
+++ /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_ifge_7.java
-.class public dxc/junit/opcodes/ifge/jm/T_ifge_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)Z
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    iflt Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_7.java b/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_7.java
deleted file mode 100644
index 045dd72..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifge/jm/T_ifge_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 dxc.junit.opcodes.ifge.jm;
-
-public class T_ifge_7 {
-    
-    public boolean run(int a) {
-        return a >= 0;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/Test_ifgt.java b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/Test_ifgt.java
deleted file mode 100644
index a23c719..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/Test_ifgt.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 dxc.junit.opcodes.ifgt;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ifgt.jm.T_ifgt_1;
-
-public class Test_ifgt extends DxTestCase {
-
-    /**
-     * @title  Argument = 5
-     */
-    public void testN1() {
-        T_ifgt_1 t = new T_ifgt_1();
-        assertEquals(1, t.run(5));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testN2() {
-        T_ifgt_1 t = new T_ifgt_1();
-        assertEquals(1234, t.run(0));
-    }
-
-    /**
-     * @title  Arguments = -5
-     */
-    public void testN3() {
-        T_ifgt_1 t = new T_ifgt_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));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_ifgt_1 t = new T_ifgt_1();
-        assertEquals(1, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_ifgt_1 t = new T_ifgt_1();
-        assertEquals(1234, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifgt.jm.T_ifgt_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifgt.jm.T_ifgt_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifgt.jm.T_ifgt_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifgt.jm.T_ifgt_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifgt.jm.T_ifgt_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifgt.jm.T_ifgt_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_1.j
deleted file mode 100644
index b259343..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_1.j
+++ /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_ifgt_1.java
-.class public dxc/junit/opcodes/ifgt/jm/T_ifgt_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(I)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-   
-    ifgt Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_1.java
deleted file mode 100644
index 5578ce0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_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 dxc.junit.opcodes.ifgt.jm;
-
-public class T_ifgt_1 {
-
-    public int run(int a) {
-        return a > 0 ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_2.j
deleted file mode 100644
index 16cd6de..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_2.j
+++ /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_ifgt_2.java
-.class public dxc/junit/opcodes/ifgt/jm/T_ifgt_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-;    iload_1
-    ifgt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_2.java
deleted file mode 100644
index 6b130b9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_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 dxc.junit.opcodes.ifgt.jm;
-
-public class T_ifgt_2 {
-
-    public boolean run(int a) {
-        return a > 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_3.j
deleted file mode 100644
index 986ac04..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_3.j
+++ /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_ifgt_3.java
-.class public dxc/junit/opcodes/ifgt/jm/T_ifgt_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 4
-    .limit locals 3
-
-;    iload_1
-    dconst_1
-    ifgt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_3.java
deleted file mode 100644
index 3e76835..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_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 dxc.junit.opcodes.ifgt.jm;
-
-public class T_ifgt_3 {
-
-    public boolean run(int a) {
-        return a > 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_4.j
deleted file mode 100644
index 78a8221..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_4.j
+++ /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_ifgt_4.java
-.class public dxc/junit/opcodes/ifgt/jm/T_ifgt_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-;    iload_1
-
-    ifgt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_4.java
deleted file mode 100644
index 5b65155..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_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 dxc.junit.opcodes.ifgt.jm;
-
-public class T_ifgt_4 {
-
-    public boolean run(int a) {
-        return a > 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_5.cfh
deleted file mode 100644
index 4ce7be3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/ifgt/jm/T_ifgt_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 7, h: 0005: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 63, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 69, len 37, h: 0007: utf8{"dxc/junit/opcodes/ifgt/jm/T_ifgt_5"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  g  t  /  j  m  /  T  _  i  f  g  t  _  5  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 67 74 2f 6a 6d 2f 54 5f 69 66 67 74 5f 35 
-    // parsed:, offset 106, len 16, h: 0008: utf8{"T_ifgt_5.java"}
-    // .  .  .  T  _  i  f  g  t  _  5  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 67 74 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 122, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0b 
-    // parsed:, offset 127, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 134, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 140, len 3, h: 000c: type{dxc.junit.opcodes.ifgt.jm.T_ifgt_5}
-    // .  .  .  
-       07 00 07 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.ifgt.jm.T_ifgt_5}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:75,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:44,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 199, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: ifgt 00ff
-        // .  .  .  
-//@mod     9d 00 05    
-           9d 00 ff 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 7, len 1, h: 0007: ireturn
-        // .  
-           ac 
-        // parsed:, offset 219, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 221, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 223, len 0, h: end attributes[0] 
-// parsed:, offset 223, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 223, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 225, len 0, h:  attributes[0]: 
-    // parsed:, offset 225, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 227, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 231, len 2, h: source: utf8{"T_ifgt_5.java"}
-    // .  .  
-       00 08 
-// parsed:, offset 233, len 0, h: end attributes[0] 
-// parsed:, offset 233, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_5.j
deleted file mode 100644
index ec5cb22..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_5.j
+++ /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_ifgt_5.java
-.class public dxc/junit/opcodes/ifgt/jm/T_ifgt_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    ifgt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_5.java
deleted file mode 100644
index 5153975..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_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 dxc.junit.opcodes.ifgt.jm;
-
-public class T_ifgt_5 {
-
-    public boolean run(int a) {
-        return a > 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_6.cfh
deleted file mode 100644
index 0b9b936..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_6.cfh
+++ /dev/null
@@ -1,201 +0,0 @@
-//@class:dxc/junit/opcodes/ifgt/jm/T_ifgt_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 7, h: 0005: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 63, len 37, h: 0006: utf8{"dxc/junit/opcodes/ifgt/jm/T_ifgt_6"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  g  t  /  j  m  /  T  _  i  f  g  t  _  6  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 67 74 2f 6a 6d 2f 54 5f 69 66 67 74 5f 36 
-    // parsed:, offset 100, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 106, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0c 
-    // parsed:, offset 111, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 118, len 16, h: 000a: utf8{"T_ifgt_6.java"}
-    // .  .  .  T  _  i  f  g  t  _  6  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 67 74 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 134, len 3, h: 000b: type{dxc.junit.opcodes.ifgt.jm.T_ifgt_6}
-    // .  .  .  
-       07 00 06 
-    // parsed:, offset 137, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.ifgt.jm.T_ifgt_6}
-// .  .  
-   00 0b 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:78,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:47,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 199, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: ifgt 0007
-        // .  .  .  
-//@mod     9d 00 05    
-           9d 00 06 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 7, len 2, h: 0007: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 9, len 1, h: 0009: nop
-        // .  
-           00 
-        // parsed:, offset 10, len 1, h: 000a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 222, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 224, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 226, len 0, h: end attributes[0] 
-// parsed:, offset 226, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 226, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 228, len 0, h:  attributes[0]: 
-    // parsed:, offset 228, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 230, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 234, len 2, h: source: utf8{"T_ifgt_6.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 236, len 0, h: end attributes[0] 
-// parsed:, offset 236, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_6.j
deleted file mode 100644
index 80abe2d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_6.j
+++ /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_ifgt_6.java
-.class public dxc/junit/opcodes/ifgt/jm/T_ifgt_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    ifgt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_6.java
deleted file mode 100644
index f56d5e0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_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 dxc.junit.opcodes.ifgt.jm;
-
-public class T_ifgt_6 {
-
-    public boolean run(int a) {
-        return a > 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_7.j b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_7.j
deleted file mode 100644
index 175e006..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_7.j
+++ /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_ifgt_7.java
-.class public dxc/junit/opcodes/ifgt/jm/T_ifgt_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)Z
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    ifle Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_7.java b/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_7.java
deleted file mode 100644
index 4572fbf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifgt/jm/T_ifgt_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 dxc.junit.opcodes.ifgt.jm;
-
-public class T_ifgt_7 {
-    
-    public boolean run(int a) {
-        return a > 0;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/Test_ifle.java b/tools/dx-tests/src/dxc/junit/opcodes/ifle/Test_ifle.java
deleted file mode 100644
index 9e722fb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/Test_ifle.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 dxc.junit.opcodes.ifle;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ifle.jm.T_ifle_1;
-
-public class Test_ifle extends DxTestCase {
-
-    /**
-     * @title  Argument = 5
-     */
-    public void testN1() {
-        T_ifle_1 t = new T_ifle_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));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testN2() {
-        T_ifle_1 t = new T_ifle_1();
-        assertEquals(1, t.run(0));
-    }
-
-    /**
-     * @title  Arguments = -5
-     */
-    public void testN3() {
-        T_ifle_1 t = new T_ifle_1();
-        assertEquals(1, t.run(-5));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_ifle_1 t = new T_ifle_1();
-        assertEquals(1234, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_ifle_1 t = new T_ifle_1();
-        assertEquals(1, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifle.jm.T_ifle_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifle.jm.T_ifle_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifle.jm.T_ifle_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifle.jm.T_ifle_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifle.jm.T_ifle_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifle.jm.T_ifle_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_1.j
deleted file mode 100644
index 19942fd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_1.j
+++ /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_ifle_1.java
-.class public dxc/junit/opcodes/ifle/jm/T_ifle_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(I)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-   
-    ifle Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_1.java
deleted file mode 100644
index bef4888..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_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 dxc.junit.opcodes.ifle.jm;
-
-public class T_ifle_1 {
-
-    public int run(int a) {
-        return a <= 0 ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_2.j
deleted file mode 100644
index 21916f4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_2.j
+++ /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_ifle_2.java
-.class public dxc/junit/opcodes/ifle/jm/T_ifle_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-;    iload_1
-    ifle Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_2.java
deleted file mode 100644
index f5b592b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_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 dxc.junit.opcodes.ifle.jm;
-
-public class T_ifle_2 {
-
-    public boolean run(int a) {
-        return a <= 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_3.j
deleted file mode 100644
index ce3bacb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_3.j
+++ /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_ifle_3.java
-.class public dxc/junit/opcodes/ifle/jm/T_ifle_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 4
-    .limit locals 3
-
-;    iload_1
-    dconst_1
-    ifle Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_3.java
deleted file mode 100644
index 5c5ea8a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_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 dxc.junit.opcodes.ifle.jm;
-
-public class T_ifle_3 {
-
-    public boolean run(int a) {
-        return a <= 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_4.j
deleted file mode 100644
index 1d09835..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_4.j
+++ /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_ifle_4.java
-.class public dxc/junit/opcodes/ifle/jm/T_ifle_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-;    iload_1
-
-    ifle Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_4.java
deleted file mode 100644
index 14731b3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_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 dxc.junit.opcodes.ifle.jm;
-
-public class T_ifle_4 {
-
-    public boolean run(int a) {
-        return a <= 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_5.cfh
deleted file mode 100644
index 1d1f660..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/ifle/jm/T_ifle_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 3, h: 0004: type{dxc.junit.opcodes.ifle.jm.T_ifle_5}
-    // .  .  .  
-       07 00 0c 
-    // parsed:, offset 50, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 59, len 7, h: 0006: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 66, len 16, h: 0007: utf8{"T_ifle_5.java"}
-    // .  .  .  T  _  i  f  l  e  _  5  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 6c 65 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 82, len 6, h: 0008: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 88, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 93, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 100, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 106, len 37, h: 000c: utf8{"dxc/junit/opcodes/ifle/jm/T_ifle_5"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  l  e  /  j  m  /  T  _  i  f  l  e  _  5  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 6c 65 2f 6a 6d 2f 54 5f 69 66 6c 65 5f 35 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.ifle.jm.T_ifle_5}
-// .  .  
-   00 04 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:75,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:44,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 08 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 06 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 199, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: ifle 00ff
-        // .  .  .  
-//@mod     9e 00 05    
-           9e 00 ff 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 7, len 1, h: 0007: ireturn
-        // .  
-           ac 
-        // parsed:, offset 219, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 221, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 223, len 0, h: end attributes[0] 
-// parsed:, offset 223, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 223, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 225, len 0, h:  attributes[0]: 
-    // parsed:, offset 225, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 227, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 231, len 2, h: source: utf8{"T_ifle_5.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 233, len 0, h: end attributes[0] 
-// parsed:, offset 233, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_5.j
deleted file mode 100644
index 8005cf8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_5.j
+++ /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_ifle_5.java
-.class public dxc/junit/opcodes/ifle/jm/T_ifle_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    ifle Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_5.java
deleted file mode 100644
index bec3678..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_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 dxc.junit.opcodes.ifle.jm;
-
-public class T_ifle_5 {
-
-    public boolean run(int a) {
-        return a <= 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_6.cfh
deleted file mode 100644
index d7097b9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_6.cfh
+++ /dev/null
@@ -1,201 +0,0 @@
-//@class:dxc/junit/opcodes/ifle/jm/T_ifle_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 3, h: 0003: type{dxc.junit.opcodes.ifle.jm.T_ifle_6}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 37, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 50, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 59, len 7, h: 0006: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 66, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 72, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0c 
-    // parsed:, offset 77, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 84, len 16, h: 000a: utf8{"T_ifle_6.java"}
-    // .  .  .  T  _  i  f  l  e  _  6  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 6c 65 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 100, len 37, h: 000b: utf8{"dxc/junit/opcodes/ifle/jm/T_ifle_6"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  l  e  /  j  m  /  T  _  i  f  l  e  _  6  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 6c 65 2f 6a 6d 2f 54 5f 69 66 6c 65 5f 36 
-    // parsed:, offset 137, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.ifle.jm.T_ifle_6}
-// .  .  
-   00 03 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:78,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:47,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 06 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 199, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: ifle 0007
-        // .  .  .  
-//@mod     9e 00 05    
-           9e 00 06 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 7, len 2, h: 0007: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 9, len 1, h: 0009: nop
-        // .  
-           00 
-        // parsed:, offset 10, len 1, h: 000a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 222, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 224, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 226, len 0, h: end attributes[0] 
-// parsed:, offset 226, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 226, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 228, len 0, h:  attributes[0]: 
-    // parsed:, offset 228, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 230, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 234, len 2, h: source: utf8{"T_ifle_6.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 236, len 0, h: end attributes[0] 
-// parsed:, offset 236, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_6.j
deleted file mode 100644
index e6d9d8a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_6.j
+++ /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_ifle_6.java
-.class public dxc/junit/opcodes/ifle/jm/T_ifle_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    ifle Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_6.java
deleted file mode 100644
index f3abc61..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_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 dxc.junit.opcodes.ifle.jm;
-
-public class T_ifle_6 {
-
-    public boolean run(int a) {
-        return a <= 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_7.j b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_7.j
deleted file mode 100644
index 649773f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_7.j
+++ /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_ifle_7.java
-.class public dxc/junit/opcodes/ifle/jm/T_ifle_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)Z
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    ifgt Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_7.java b/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_7.java
deleted file mode 100644
index 02ca988f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifle/jm/T_ifle_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 dxc.junit.opcodes.ifle.jm;
-
-public class T_ifle_7 {
-    
-    public boolean run(int a) {
-        return a <= 0;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/Test_iflt.java b/tools/dx-tests/src/dxc/junit/opcodes/iflt/Test_iflt.java
deleted file mode 100644
index edd37e6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/Test_iflt.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 dxc.junit.opcodes.iflt;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iflt.jm.T_iflt_1;
-
-public class Test_iflt extends DxTestCase {
-
-    /**
-     * @title  Argument = 5
-     */
-    public void testN1() {
-        T_iflt_1 t = new T_iflt_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));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testN2() {
-        T_iflt_1 t = new T_iflt_1();
-        assertEquals(1234, t.run(0));
-    }
-
-    /**
-     * @title  Arguments = -5
-     */
-    public void testN3() {
-        T_iflt_1 t = new T_iflt_1();
-        assertEquals(1, t.run(-5));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_iflt_1 t = new T_iflt_1();
-        assertEquals(1234, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_iflt_1 t = new T_iflt_1();
-        assertEquals(1, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iflt.jm.T_iflt_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iflt.jm.T_iflt_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iflt.jm.T_iflt_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iflt.jm.T_iflt_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.iflt.jm.T_iflt_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.iflt.jm.T_iflt_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_1.j
deleted file mode 100644
index c10806b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_1.j
+++ /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_iflt_1.java
-.class public dxc/junit/opcodes/iflt/jm/T_iflt_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(I)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-   
-    iflt Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_1.java
deleted file mode 100644
index 2bc2aff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_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 dxc.junit.opcodes.iflt.jm;
-
-public class T_iflt_1 {
-
-    public int run(int a) {
-        return a < 0 ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_2.j
deleted file mode 100644
index b9d0b34..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_2.j
+++ /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_iflt_2.java
-.class public dxc/junit/opcodes/iflt/jm/T_iflt_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-;    iload_1
-    iflt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_2.java
deleted file mode 100644
index 9f48304..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_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 dxc.junit.opcodes.iflt.jm;
-
-public class T_iflt_2 {
-
-    public boolean run(int a) {
-        return a < 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_3.j
deleted file mode 100644
index eec66c2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_3.j
+++ /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_iflt_3.java
-.class public dxc/junit/opcodes/iflt/jm/T_iflt_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 4
-    .limit locals 3
-
-;    iload_1
-    dconst_1
-    iflt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_3.java
deleted file mode 100644
index a238c05..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_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 dxc.junit.opcodes.iflt.jm;
-
-public class T_iflt_3 {
-
-    public boolean run(int a) {
-        return a < 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_4.j
deleted file mode 100644
index ba405a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_4.j
+++ /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_iflt_4.java
-.class public dxc/junit/opcodes/iflt/jm/T_iflt_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-;    iload_1
-
-    iflt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_4.java
deleted file mode 100644
index 38e2c68..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_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 dxc.junit.opcodes.iflt.jm;
-
-public class T_iflt_4 {
-
-    public boolean run(int a) {
-        return a < 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_5.cfh
deleted file mode 100644
index e2301a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/iflt/jm/T_iflt_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 3, h: 0003: type{dxc.junit.opcodes.iflt.jm.T_iflt_5}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 37, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 50, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 59, len 7, h: 0006: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 66, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 72, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0c 
-    // parsed:, offset 77, len 37, h: 0009: utf8{"dxc/junit/opcodes/iflt/jm/T_iflt_5"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  l  t  /  j  m  /  T  _  i  f  l  t  _  5  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 6c 74 2f 6a 6d 2f 54 5f 69 66 6c 74 5f 35 
-    // parsed:, offset 114, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 121, len 16, h: 000b: utf8{"T_iflt_5.java"}
-    // .  .  .  T  _  i  f  l  t  _  5  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 6c 74 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 137, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.iflt.jm.T_iflt_5}
-// .  .  
-   00 03 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:75,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:44,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 06 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 199, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: iflt 00ff
-        // .  .  .  
-//@mod     9b 00 05    
-           9b 00 ff 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 7, len 1, h: 0007: ireturn
-        // .  
-           ac 
-        // parsed:, offset 219, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 221, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 223, len 0, h: end attributes[0] 
-// parsed:, offset 223, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 223, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 225, len 0, h:  attributes[0]: 
-    // parsed:, offset 225, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 227, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 231, len 2, h: source: utf8{"T_iflt_5.java"}
-    // .  .  
-       00 0b 
-// parsed:, offset 233, len 0, h: end attributes[0] 
-// parsed:, offset 233, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_5.j
deleted file mode 100644
index 329d205..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_5.j
+++ /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_iflt_5.java
-.class public dxc/junit/opcodes/iflt/jm/T_iflt_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iflt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_5.java
deleted file mode 100644
index 519a973..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_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 dxc.junit.opcodes.iflt.jm;
-
-public class T_iflt_5 {
-
-    public boolean run(int a) {
-        return a < 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_6.cfh
deleted file mode 100644
index ee7a8f3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_6.cfh
+++ /dev/null
@@ -1,201 +0,0 @@
-//@class:dxc/junit/opcodes/iflt/jm/T_iflt_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 09 
-    // parsed:, offset 15, len 3, h: 0002: type{dxc.junit.opcodes.iflt.jm.T_iflt_6}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 18, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 37, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 50, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 59, len 7, h: 0006: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 66, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 72, len 37, h: 0008: utf8{"dxc/junit/opcodes/iflt/jm/T_iflt_6"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  l  t  /  j  m  /  T  _  i  f  l  t  _  6  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 6c 74 2f 6a 6d 2f 54 5f 69 66 6c 74 5f 36 
-    // parsed:, offset 109, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 114, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 121, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 127, len 16, h: 000c: utf8{"T_iflt_6.java"}
-    // .  .  .  T  _  i  f  l  t  _  6  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 6c 74 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.iflt.jm.T_iflt_6}
-// .  .  
-   00 02 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:78,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:47,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 06 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 199, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: iflt 0007
-        // .  .  .  
-//@mod     9b 00 05    
-           9b 00 06 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 7, len 2, h: 0007: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 9, len 1, h: 0009: nop
-        // .  
-           00 
-        // parsed:, offset 10, len 1, h: 000a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 222, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 224, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 226, len 0, h: end attributes[0] 
-// parsed:, offset 226, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 226, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 228, len 0, h:  attributes[0]: 
-    // parsed:, offset 228, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 230, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 234, len 2, h: source: utf8{"T_iflt_6.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 236, len 0, h: end attributes[0] 
-// parsed:, offset 236, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_6.j b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_6.j
deleted file mode 100644
index 69fa9a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_6.j
+++ /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_iflt_6.java
-.class public dxc/junit/opcodes/iflt/jm/T_iflt_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iflt Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_6.java b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_6.java
deleted file mode 100644
index 5d36ee1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_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 dxc.junit.opcodes.iflt.jm;
-
-public class T_iflt_6 {
-
-    public boolean run(int a) {
-        return a < 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_7.j b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_7.j
deleted file mode 100644
index 2e985e9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_7.j
+++ /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_iflt_7.java
-.class public dxc/junit/opcodes/iflt/jm/T_iflt_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)Z
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    ifge Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_7.java b/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_7.java
deleted file mode 100644
index ecbf595..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iflt/jm/T_iflt_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 dxc.junit.opcodes.iflt.jm;
-
-public class T_iflt_7 {
-    
-    public boolean run(int a) {
-        return a < 0;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/Test_ifne.java b/tools/dx-tests/src/dxc/junit/opcodes/ifne/Test_ifne.java
deleted file mode 100644
index fc4551e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/Test_ifne.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 dxc.junit.opcodes.ifne;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ifne.jm.T_ifne_1;
-
-public class Test_ifne extends DxTestCase {
-
-    /**
-     * @title  Argument = 5
-     */
-    public void testN1() {
-        T_ifne_1 t = new T_ifne_1();
-        assertEquals(1, t.run(5));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testN2() {
-        T_ifne_1 t = new T_ifne_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(0));
-    }
-
-    /**
-     * @title  Arguments = -5
-     */
-    public void testN3() {
-        T_ifne_1 t = new T_ifne_1();
-        assertEquals(1, t.run(-5));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_ifne_1 t = new T_ifne_1();
-        assertEquals(1, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_ifne_1 t = new T_ifne_1();
-        assertEquals(1, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifne.jm.T_ifne_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifne.jm.T_ifne_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifne.jm.T_ifne_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifne.jm.T_ifne_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifne.jm.T_ifne_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifne.jm.T_ifne_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_1.j
deleted file mode 100644
index 34204a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_1.j
+++ /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_ifne_1.java
-.class public dxc/junit/opcodes/ifne/jm/T_ifne_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(I)I
-    .limit stack 2
-    .limit locals 3
-    
-    iload_1
-   
-    ifne Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_1.java
deleted file mode 100644
index 732a1a0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_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 dxc.junit.opcodes.ifne.jm;
-
-public class T_ifne_1 {
-
-    public int run(int a) {
-        return a != 0 ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_2.j
deleted file mode 100644
index f5c9b87..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_2.j
+++ /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_ifne_2.java
-.class public dxc/junit/opcodes/ifne/jm/T_ifne_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-;    iload_1
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_2.java
deleted file mode 100644
index ae1a1d5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_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 dxc.junit.opcodes.ifne.jm;
-
-public class T_ifne_2 {
-
-    public boolean run(int a) {
-        return a != 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_3.j
deleted file mode 100644
index 7fb2fa9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_3.j
+++ /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_ifne_3.java
-.class public dxc/junit/opcodes/ifne/jm/T_ifne_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 4
-    .limit locals 3
-
-;    iload_1
-    dconst_1
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_3.java
deleted file mode 100644
index 20722fd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_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 dxc.junit.opcodes.ifne.jm;
-
-public class T_ifne_3 {
-
-    public boolean run(int a) {
-        return a != 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_4.j
deleted file mode 100644
index 5149438..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_4.j
+++ /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_ifne_4.java
-.class public dxc/junit/opcodes/ifne/jm/T_ifne_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-;    iload_1
-
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_4.java
deleted file mode 100644
index 8dd3ad5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_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 dxc.junit.opcodes.ifne.jm;
-
-public class T_ifne_4 {
-
-    public boolean run(int a) {
-        return a != 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_5.cfh
deleted file mode 100644
index d29f6ff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/ifne/jm/T_ifne_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 16, h: 0002: utf8{"T_ifne_5.java"}
-    // .  .  .  T  _  i  f  n  e  _  5  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 6e 65 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 31, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 50, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 63, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 72, len 7, h: 0006: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 79, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 85, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 90, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 97, len 37, h: 000a: utf8{"dxc/junit/opcodes/ifne/jm/T_ifne_5"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  n  e  /  j  m  /  T  _  i  f  n  e  _  5  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 6e 65 2f 6a 6d 2f 54 5f 69 66 6e 65 5f 35 
-    // parsed:, offset 134, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 140, len 3, h: 000c: type{dxc.junit.opcodes.ifne.jm.T_ifne_5}
-    // .  .  .  
-       07 00 0a 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.ifne.jm.T_ifne_5}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:75,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:44,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 06 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 199, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: ifne 00ff
-        // .  .  .  
-//@mod     9a 00 05    
-           9a 00 ff 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 7, len 1, h: 0007: ireturn
-        // .  
-           ac 
-        // parsed:, offset 219, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 221, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 223, len 0, h: end attributes[0] 
-// parsed:, offset 223, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 223, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 225, len 0, h:  attributes[0]: 
-    // parsed:, offset 225, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 227, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 231, len 2, h: source: utf8{"T_ifne_5.java"}
-    // .  .  
-       00 02 
-// parsed:, offset 233, len 0, h: end attributes[0] 
-// parsed:, offset 233, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_5.j
deleted file mode 100644
index 96b5869..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_5.j
+++ /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_ifne_5.java
-.class public dxc/junit/opcodes/ifne/jm/T_ifne_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_5.java
deleted file mode 100644
index 13dac02..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_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 dxc.junit.opcodes.ifne.jm;
-
-public class T_ifne_5 {
-
-    public boolean run(int a) {
-        return a != 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_6.cfh
deleted file mode 100644
index d195942..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_6.cfh
+++ /dev/null
@@ -1,201 +0,0 @@
-//@class:dxc/junit/opcodes/ifne/jm/T_ifne_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 7, h: 0005: utf8{"(I)Z"}
-    // .  .  .  (  I  )  Z  
-       01 00 04 28 49 29 5a 
-    // parsed:, offset 63, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 69, len 16, h: 0007: utf8{"T_ifne_6.java"}
-    // .  .  .  T  _  i  f  n  e  _  6  .  j  a  v  a  
-       01 00 0d 54 5f 69 66 6e 65 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 85, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0b 
-    // parsed:, offset 90, len 37, h: 0009: utf8{"dxc/junit/opcodes/ifne/jm/T_ifne_6"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  n  e  /  j  m  /  T  _  i  f  n  e  _  6  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 6e 65 2f 6a 6d 2f 54 5f 69 66 6e 65 5f 36 
-    // parsed:, offset 127, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 134, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 140, len 3, h: 000c: type{dxc.junit.opcodes.ifne.jm.T_ifne_6}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 143, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 146, len 0, h: end constant_pool
-// parsed:, offset 146, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 148, len 2, h: this_class: type{dxc.junit.opcodes.ifne.jm.T_ifne_6}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 152, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 156, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 158, len:78,desc: ()V
-// parsed:, offset 158, len 0, h:  methods[0]: 
-    // parsed:, offset 158, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 160, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 162, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 164, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 166, len 0, h:  attributes[0]: 
-        // parsed:, offset 166, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 168, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 172, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 176, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 185, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 187, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 189, len 0, h: end attributes[0] 
-// parsed:, offset 189, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 189, len:47,desc: (I)Z
-// parsed:, offset 189, len 0, h:  methods[1]: 
-    // parsed:, offset 189, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 193, len 2, h: descriptor: (I)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 195, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 197, len 0, h:  attributes[0]: 
-        // parsed:, offset 197, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 199, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 203, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 205, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 207, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 3, h: 0001: ifne 0007
-        // .  .  .  
-//@mod     9a 00 05    
-           9a 00 06 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: wide
-        // .  
-//@mod     00
-           c4 
-        // parsed:, offset 7, len 2, h: 0007: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 9, len 1, h: 0009: nop
-        // .  
-           00 
-        // parsed:, offset 10, len 1, h: 000a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 222, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 224, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 226, len 0, h: end attributes[0] 
-// parsed:, offset 226, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)Z
-// parsed:, offset 226, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 228, len 0, h:  attributes[0]: 
-    // parsed:, offset 228, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 230, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 234, len 2, h: source: utf8{"T_ifne_6.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 236, len 0, h: end attributes[0] 
-// parsed:, offset 236, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_6.j
deleted file mode 100644
index 9ac3dfc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_6.j
+++ /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_ifne_6.java
-.class public dxc/junit/opcodes/ifne/jm/T_ifne_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(I)Z
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    ifne Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_6.java
deleted file mode 100644
index 4c1f04a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_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 dxc.junit.opcodes.ifne.jm;
-
-public class T_ifne_6 {
-
-    public boolean run(int a) {
-        return a != 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_7.j b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_7.j
deleted file mode 100644
index 4c55236..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_7.j
+++ /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_ifne_7.java
-.class public dxc/junit/opcodes/ifne/jm/T_ifne_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)Z
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    ifeq Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_7.java b/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_7.java
deleted file mode 100644
index 29af909..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifne/jm/T_ifne_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 dxc.junit.opcodes.ifne.jm;
-
-public class T_ifne_7 {
-    
-    public boolean run(int a) {
-        return a != 0;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/Test_ifnonnull.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/Test_ifnonnull.java
deleted file mode 100644
index d8b5c71..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/Test_ifnonnull.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 dxc.junit.opcodes.ifnonnull;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ifnonnull.jm.T_ifnonnull_1;
-
-public class Test_ifnonnull extends DxTestCase {
-
-    /**
-     * @title  Argument = this
-     */
-    public void testN1() {
-        T_ifnonnull_1 t = new T_ifnonnull_1();
-        assertEquals(1, t.run(this));
-    }
-
-    /**
-     * @title  Argument = null
-     */
-    public void testN2() {
-        T_ifnonnull_1 t = new T_ifnonnull_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(null));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifnonnull.jm.T_ifnonnull_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifnonnull.jm.T_ifnonnull_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifnonnull.jm.T_ifnonnull_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifnonnull.jm.T_ifnonnull_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifnonnull.jm.T_ifnonnull_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_1.j
deleted file mode 100644
index 2eb0c73..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_1.j
+++ /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_ifne_1.java
-.class public dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(Ljava/lang/Object;)I
-    .limit stack 2
-    .limit locals 3
-    
-    aload_1
-   
-    ifnonnull Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_1.java
deleted file mode 100644
index 014b4f9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_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 dxc.junit.opcodes.ifnonnull.jm;
-
-public class T_ifnonnull_1 {
-
-    public int run(Object o) {
-        return o != null ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_2.j
deleted file mode 100644
index 813c5aa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_2.j
+++ /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_ifnonnull_2.java
-.class public dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-
-;    aload_1
-    ifnonnull Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_2.java
deleted file mode 100644
index 9285306..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_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 dxc.junit.opcodes.ifnonnull.jm;
-
-public class T_ifnonnull_2 {
-
-    public boolean run(Object o) {
-        return o != null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_3.j
deleted file mode 100644
index ab9f3ee..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_3.j
+++ /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_ifnonnull_3.java
-.class public dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 4
-    .limit locals 3
-
-;    aload_1
-    dconst_1
-    ifnonnull Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_3.java
deleted file mode 100644
index ae1407f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_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 dxc.junit.opcodes.ifnonnull.jm;
-
-public class T_ifnonnull_3 {
-
-    public boolean run(Object o) {
-        return o != null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_4.j
deleted file mode 100644
index 396a721..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_4.j
+++ /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_ifnonnull_4.java
-.class public dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-;    aload_1
-
-    ifnonnull Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_4.java
deleted file mode 100644
index adba24a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_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 dxc.junit.opcodes.ifnonnull.jm;
-
-public class T_ifnonnull_4 {
-
-    public boolean run(Object o) {
-        return o != null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5.cfh
deleted file mode 100644
index b430047..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 47, h: 0003: utf8{"dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  n  o  n  n  u  l  l  /  j  m  /  T  _  i  f  n  o  n  n  u  l  l  _  5  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 6e 6f 6e 6e 75 6c 6c 2f 6a 6d 2f 54 5f 69 66 6e 6f 6e 6e 75 6c 6c 5f 35 
-    // parsed:, offset 81, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 94, len 24, h: 0005: utf8{"(Ljava/lang/Object;)Z"}
-    // .  .  .  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  Z  
-       01 00 15 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 5a 
-    // parsed:, offset 118, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 127, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 133, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0c 
-    // parsed:, offset 138, len 21, h: 0009: utf8{"T_ifnonnull_5.java"}
-    // .  .  .  T  _  i  f  n  o  n  n  u  l  l  _  5  .  j  a  v  a  
-       01 00 12 54 5f 69 66 6e 6f 6e 6e 75 6c 6c 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 159, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 166, len 3, h: 000b: type{dxc.junit.opcodes.ifnonnull.jm.T_ifnonnull_5}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 169, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 175, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 178, len 0, h: end constant_pool
-// parsed:, offset 178, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 180, len 2, h: this_class: type{dxc.junit.opcodes.ifnonnull.jm.T_ifnonnull_5}
-// .  .  
-   00 0b 
-// parsed:, offset 182, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 184, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 186, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 188, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 190, len:75,desc: ()V
-// parsed:, offset 190, len 0, h:  methods[0]: 
-    // parsed:, offset 190, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 192, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 194, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 196, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 198, len 0, h:  attributes[0]: 
-        // parsed:, offset 198, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 200, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 204, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 206, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 208, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 217, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 219, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 221, len 0, h: end attributes[0] 
-// parsed:, offset 221, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 221, len:44,desc: (Ljava/lang/Object;)Z
-// parsed:, offset 221, len 0, h:  methods[1]: 
-    // parsed:, offset 221, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 223, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 225, len 2, h: descriptor: (Ljava/lang/Object;)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 227, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 229, len 0, h:  attributes[0]: 
-        // parsed:, offset 229, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 231, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 235, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 237, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 239, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 3, h: 0001: ifnonnull 00ff
-        // .  .  .  
-//@mod     c7 00 05    
-           c7 00 ff 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 7, len 1, h: 0007: ireturn
-        // .  
-           ac 
-        // parsed:, offset 251, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 253, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 255, len 0, h: end attributes[0] 
-// parsed:, offset 255, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/Object;)Z
-// parsed:, offset 255, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 257, len 0, h:  attributes[0]: 
-    // parsed:, offset 257, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 259, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 263, len 2, h: source: utf8{"T_ifnonnull_5.java"}
-    // .  .  
-       00 09 
-// parsed:, offset 265, len 0, h: end attributes[0] 
-// parsed:, offset 265, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5.j
deleted file mode 100644
index 087febb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5.j
+++ /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_ifnonnull_5.java
-.class public dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    ifnonnull Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_5.java
deleted file mode 100644
index 8d400cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_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 dxc.junit.opcodes.ifnonnull.jm;
-
-public class T_ifnonnull_5 {
-
-    public boolean run(Object o) {
-        return o != null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6.cfh
deleted file mode 100644
index 913fcfc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6.cfh
+++ /dev/null
@@ -1,201 +0,0 @@
-//@class:dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 47, h: 0003: utf8{"dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  n  o  n  n  u  l  l  /  j  m  /  T  _  i  f  n  o  n  n  u  l  l  _  6  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 6e 6f 6e 6e 75 6c 6c 2f 6a 6d 2f 54 5f 69 66 6e 6f 6e 6e 75 6c 6c 5f 36 
-    // parsed:, offset 81, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 94, len 24, h: 0005: utf8{"(Ljava/lang/Object;)Z"}
-    // .  .  .  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  Z  
-       01 00 15 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 5a 
-    // parsed:, offset 118, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 127, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 133, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0b 
-    // parsed:, offset 138, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 145, len 3, h: 000a: type{dxc.junit.opcodes.ifnonnull.jm.T_ifnonnull_6}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 148, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 154, len 21, h: 000c: utf8{"T_ifnonnull_6.java"}
-    // .  .  .  T  _  i  f  n  o  n  n  u  l  l  _  6  .  j  a  v  a  
-       01 00 12 54 5f 69 66 6e 6f 6e 6e 75 6c 6c 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 175, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 178, len 0, h: end constant_pool
-// parsed:, offset 178, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 180, len 2, h: this_class: type{dxc.junit.opcodes.ifnonnull.jm.T_ifnonnull_6}
-// .  .  
-   00 0a 
-// parsed:, offset 182, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 184, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 186, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 188, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 190, len:78,desc: ()V
-// parsed:, offset 190, len 0, h:  methods[0]: 
-    // parsed:, offset 190, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 192, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 194, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 196, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 198, len 0, h:  attributes[0]: 
-        // parsed:, offset 198, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 200, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 204, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 206, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 208, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 217, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 219, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 221, len 0, h: end attributes[0] 
-// parsed:, offset 221, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 221, len:47,desc: (Ljava/lang/Object;)Z
-// parsed:, offset 221, len 0, h:  methods[1]: 
-    // parsed:, offset 221, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 223, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 225, len 2, h: descriptor: (Ljava/lang/Object;)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 227, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 229, len 0, h:  attributes[0]: 
-        // parsed:, offset 229, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 231, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 235, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 237, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 239, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 3, h: 0001: ifnonnull 0007
-        // .  .  .  
-//@mod     c7 00 05    
-           c7 00 06 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: wide
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 7, len 2, h: 0007: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 9, len 1, h: 0009: nop
-        // .  
-           00 
-        // parsed:, offset 10, len 1, h: 000a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 254, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 256, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 258, len 0, h: end attributes[0] 
-// parsed:, offset 258, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/Object;)Z
-// parsed:, offset 258, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 260, len 0, h:  attributes[0]: 
-    // parsed:, offset 260, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 262, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 266, len 2, h: source: utf8{"T_ifnonnull_6.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 268, len 0, h: end attributes[0] 
-// parsed:, offset 268, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6.j
deleted file mode 100644
index 10daa6c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6.j
+++ /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_ifnonnull_6.java
-.class public dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    ifnonnull Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_6.java
deleted file mode 100644
index 062b42a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnonnull/jm/T_ifnonnull_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 dxc.junit.opcodes.ifnonnull.jm;
-
-public class T_ifnonnull_6 {
-
-    public boolean run(Object o) {
-        return o != null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/Test_ifnull.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/Test_ifnull.java
deleted file mode 100644
index a7b5eac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/Test_ifnull.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 dxc.junit.opcodes.ifnull;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ifnull.jm.T_ifnull_1;
-
-public class Test_ifnull extends DxTestCase {
-
-    /**
-     * @title  Argument = this
-     */
-    public void testN1() {
-        T_ifnull_1 t = new T_ifnull_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(this));
-    }
-
-    /**
-     * @title  Argument = null
-     */
-    public void testN2() {
-        T_ifnull_1 t = new T_ifnull_1();
-        assertEquals(1, t.run(null));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifnull.jm.T_ifnull_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifnull.jm.T_ifnull_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifnull.jm.T_ifnull_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifnull.jm.T_ifnull_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ifnull.jm.T_ifnull_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_1.j
deleted file mode 100644
index e95e9f4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_1.j
+++ /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_ifne_1.java
-.class public dxc/junit/opcodes/ifnull/jm/T_ifnull_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-; this method returns 1234 in case of failed comparison to check that execution proceeds
-; at the address following if_acmpeq instruction
-.method public run(Ljava/lang/Object;)I
-    .limit stack 2
-    .limit locals 3
-    
-    aload_1
-   
-    ifnull Label0
-    sipush 1234
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_1.java
deleted file mode 100644
index 73d7b4a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_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 dxc.junit.opcodes.ifnull.jm;
-
-public class T_ifnull_1 {
-
-    public int run(Object o) {
-        return o == null ? 1 : 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_2.j
deleted file mode 100644
index 77cbbd3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_2.j
+++ /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_ifnull_2.java
-.class public dxc/junit/opcodes/ifnull/jm/T_ifnull_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-
-;    aload_1
-    ifnull Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_2.java
deleted file mode 100644
index 2efb995..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_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 dxc.junit.opcodes.ifnull.jm;
-
-public class T_ifnull_2 {
-
-    public boolean run(Object o) {
-        return o == null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_3.j
deleted file mode 100644
index 04c94b2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_3.j
+++ /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_ifnull_3.java
-.class public dxc/junit/opcodes/ifnull/jm/T_ifnull_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 4
-    .limit locals 3
-
-    dconst_1
-    ifnull Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_3.java
deleted file mode 100644
index 44c32e9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_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 dxc.junit.opcodes.ifnull.jm;
-
-public class T_ifnull_3 {
-
-    public boolean run(Object o) {
-        return o == null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_4.j
deleted file mode 100644
index 780f5bd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_4.j
+++ /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_ifnull_4.java
-.class public dxc/junit/opcodes/ifnull/jm/T_ifnull_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 3
-    .limit locals 3
-
-    lconst_1    
-;    aload_1
-
-    ifnull Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_4.java
deleted file mode 100644
index 0a59962..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_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 dxc.junit.opcodes.ifnull.jm;
-
-public class T_ifnull_4 {
-
-    public boolean run(Object o) {
-        return o == null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_5.cfh
deleted file mode 100644
index b507146..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/ifnull/jm/T_ifnull_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 24, h: 0004: utf8{"(Ljava/lang/Object;)Z"}
-    // .  .  .  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  Z  
-       01 00 15 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 5a 
-    // parsed:, offset 71, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 80, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 86, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 91, len 41, h: 0008: utf8{"dxc/junit/opcodes/ifnull/jm/T_ifnull_5"}
-    // .  .  &  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  n  u  l  l  /  j  m  /  T  _  i  f  n  u  l  l  _  5  
-       01 00 26 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 6e 75 6c 6c 2f 6a 6d 2f 54 5f 69 66 6e 75 6c 6c 5f 35 
-    // parsed:, offset 132, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 139, len 3, h: 000a: type{dxc.junit.opcodes.ifnull.jm.T_ifnull_5}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 142, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 148, len 18, h: 000c: utf8{"T_ifnull_5.java"}
-    // .  .  .  T  _  i  f  n  u  l  l  _  5  .  j  a  v  a  
-       01 00 0f 54 5f 69 66 6e 75 6c 6c 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 166, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 169, len 0, h: end constant_pool
-// parsed:, offset 169, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 171, len 2, h: this_class: type{dxc.junit.opcodes.ifnull.jm.T_ifnull_5}
-// .  .  
-   00 0a 
-// parsed:, offset 173, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 175, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 177, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 179, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 181, len:75,desc: ()V
-// parsed:, offset 181, len 0, h:  methods[0]: 
-    // parsed:, offset 181, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 183, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 185, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 187, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 0, h:  attributes[0]: 
-        // parsed:, offset 189, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 191, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 195, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 197, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 199, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 208, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 210, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 212, len 0, h: end attributes[0] 
-// parsed:, offset 212, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 212, len:44,desc: (Ljava/lang/Object;)Z
-// parsed:, offset 212, len 0, h:  methods[1]: 
-    // parsed:, offset 212, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 214, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 216, len 2, h: descriptor: (Ljava/lang/Object;)Z
-    // .  .  
-       00 04 
-    // parsed:, offset 218, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 220, len 0, h:  attributes[0]: 
-        // parsed:, offset 220, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 222, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 226, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 228, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 230, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 3, h: 0001: ifnull 00ff
-        // .  .  .  
-//@mod     c6 00 05    
-           c6 00 ff 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 7, len 1, h: 0007: ireturn
-        // .  
-           ac 
-        // parsed:, offset 242, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 244, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 246, len 0, h: end attributes[0] 
-// parsed:, offset 246, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/Object;)Z
-// parsed:, offset 246, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 248, len 0, h:  attributes[0]: 
-    // parsed:, offset 248, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 250, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 254, len 2, h: source: utf8{"T_ifnull_5.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 256, len 0, h: end attributes[0] 
-// parsed:, offset 256, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_5.j
deleted file mode 100644
index bf01958..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_5.j
+++ /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_ifnull_5.java
-.class public dxc/junit/opcodes/ifnull/jm/T_ifnull_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    ifnull Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_5.java
deleted file mode 100644
index 4a67ef1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_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 dxc.junit.opcodes.ifnull.jm;
-
-public class T_ifnull_5 {
-
-    public boolean run(Object o) {
-        return o == null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_6.cfh
deleted file mode 100644
index faf3fcd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_6.cfh
+++ /dev/null
@@ -1,201 +0,0 @@
-//@class:dxc/junit/opcodes/ifnull/jm/T_ifnull_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 18, h: 0003: utf8{"T_ifnull_6.java"}
-    // .  .  .  T  _  i  f  n  u  l  l  _  6  .  j  a  v  a  
-       01 00 0f 54 5f 69 66 6e 75 6c 6c 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 52, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 65, len 24, h: 0005: utf8{"(Ljava/lang/Object;)Z"}
-    // .  .  .  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  Z  
-       01 00 15 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 5a 
-    // parsed:, offset 89, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 98, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 104, len 41, h: 0008: utf8{"dxc/junit/opcodes/ifnull/jm/T_ifnull_6"}
-    // .  .  &  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  f  n  u  l  l  /  j  m  /  T  _  i  f  n  u  l  l  _  6  
-       01 00 26 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 66 6e 75 6c 6c 2f 6a 6d 2f 54 5f 69 66 6e 75 6c 6c 5f 36 
-    // parsed:, offset 145, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0c 
-    // parsed:, offset 150, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 157, len 3, h: 000b: type{dxc.junit.opcodes.ifnull.jm.T_ifnull_6}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 160, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 166, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 169, len 0, h: end constant_pool
-// parsed:, offset 169, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 171, len 2, h: this_class: type{dxc.junit.opcodes.ifnull.jm.T_ifnull_6}
-// .  .  
-   00 0b 
-// parsed:, offset 173, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 175, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 177, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 179, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 181, len:78,desc: ()V
-// parsed:, offset 181, len 0, h:  methods[0]: 
-    // parsed:, offset 181, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 183, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 185, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 187, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 0, h:  attributes[0]: 
-        // parsed:, offset 189, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 191, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 195, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 197, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 199, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 208, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 210, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 212, len 0, h: end attributes[0] 
-// parsed:, offset 212, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 212, len:47,desc: (Ljava/lang/Object;)Z
-// parsed:, offset 212, len 0, h:  methods[1]: 
-    // parsed:, offset 212, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 214, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 216, len 2, h: descriptor: (Ljava/lang/Object;)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 218, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 220, len 0, h:  attributes[0]: 
-        // parsed:, offset 220, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 222, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 226, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 228, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 230, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 3, h: 0001: ifnull 0007
-        // .  .  .  
-//@mod     c6 00 05    
-           c6 00 06 
-        // parsed:, offset 4, len 1, h: 0004: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 6, len 1, h: 0006: nop
-        // .  
-//@mod     00    
-           c4 
-        // parsed:, offset 7, len 2, h: 0007: iload 01
-        // .  .  
-           15 01 
-        // parsed:, offset 9, len 1, h: 0009: nop
-        // .  
-           00 
-        // parsed:, offset 10, len 1, h: 000a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 245, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 247, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 249, len 0, h: end attributes[0] 
-// parsed:, offset 249, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/Object;)Z
-// parsed:, offset 249, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 251, len 0, h:  attributes[0]: 
-    // parsed:, offset 251, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 253, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 257, len 2, h: source: utf8{"T_ifnull_6.java"}
-    // .  .  
-       00 03 
-// parsed:, offset 259, len 0, h: end attributes[0] 
-// parsed:, offset 259, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_6.j
deleted file mode 100644
index 26ed54c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_6.j
+++ /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_ifnull_6.java
-.class public dxc/junit/opcodes/ifnull/jm/T_ifnull_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    ifnull Label0
-    iconst_0
-    ireturn
-
-    Label0:
-    nop
-    iload 1
-    nop
-;    iconst_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_6.java
deleted file mode 100644
index 8429521..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ifnull/jm/T_ifnull_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 dxc.junit.opcodes.ifnull.jm;
-
-public class T_ifnull_6 {
-
-    public boolean run(Object o) {
-        return o == null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/Test_iinc.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/Test_iinc.java
deleted file mode 100644
index f512026..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/Test_iinc.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iinc;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iinc.jm.T_iinc_1;
-import dxc.junit.opcodes.iinc.jm.T_iinc_1_w;
-import dxc.junit.opcodes.iinc.jm.T_iinc_2;
-import dxc.junit.opcodes.iinc.jm.T_iinc_2_w;
-import dxc.junit.opcodes.iinc.jm.T_iinc_3;
-import dxc.junit.opcodes.iinc.jm.T_iinc_3_w;
-import dxc.junit.opcodes.iinc.jm.T_iinc_4;
-import dxc.junit.opcodes.iinc.jm.T_iinc_4_w;
-import dxc.junit.opcodes.iinc.jm.T_iinc_5;
-import dxc.junit.opcodes.iinc.jm.T_iinc_5_w;
-import dxc.junit.opcodes.iinc.jm.T_iinc_6;
-import dxc.junit.opcodes.iinc.jm.T_iinc_6_w;
-
-public class Test_iinc extends DxTestCase {
-
-    /*
-     * NORMAL IINC VERSION
-     */
-
-    /**
-     * @title  Increment by 1
-     */
-    public void testN1() {
-        T_iinc_1 t = new T_iinc_1();
-        assertEquals(5, t.run(4));
-    }
-
-    /**
-     * @title  Increment by -1
-     */
-    public void testN2() {
-        T_iinc_2 t = new T_iinc_2();
-        assertEquals(3, t.run(4));
-    }
-
-    /**
-     * @title  Increment by 63
-     */
-    public void testN3() {
-        T_iinc_3 t = new T_iinc_3();
-        assertEquals(67, t.run(4));
-    }
-
-    /**
-     * @title  Increment by 0
-     */
-    public void testB1() {
-        T_iinc_4 t = new T_iinc_4();
-        assertEquals(Integer.MAX_VALUE, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Increment by 0
-     */
-    public void testB2() {
-        T_iinc_4 t = new T_iinc_4();
-        assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Increment by 127
-     */
-    public void testB3() {
-        T_iinc_5 t = new T_iinc_5();
-        assertEquals(128, t.run(1));
-    }
-
-    /**
-     * @title  Increment by 127
-     */
-    public void testB4() {
-        T_iinc_5 t = new T_iinc_5();
-        assertEquals(126, t.run(-1));
-    }
-
-    /**
-     * @title  Increment by 127
-     */
-    public void testB5() {
-        T_iinc_5 t = new T_iinc_5();
-        assertEquals(-2147483521, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Increment by -128
-     */
-    public void testB6() {
-        T_iinc_6 t = new T_iinc_6();
-        assertEquals(-127, t.run(1));
-    }
-
-    /**
-     * @title  Increment by -128
-     */
-    public void testB7() {
-        T_iinc_6 t = new T_iinc_6();
-        assertEquals(-128, t.run(0));
-    }
-
-    /**
-     * @constraint 4.8.1.21
-     * @title index must be no greater than
-     * max_locals-1.
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iinc.jm.T_iinc_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.21
-     * @title index must be a nonnegative integer.
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iinc.jm.T_iinc_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iinc.jm.T_iinc_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iinc.jm.T_iinc_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE IINC VERSION
-     */
-
-    /**
-     * @title  Increment by 1
-     */
-    public void testN4() {
-        T_iinc_1_w t = new T_iinc_1_w();
-        assertEquals(5, t.run(4));
-    }
-
-    /**
-     * @title  Increment by -1
-     */
-    public void testN5() {
-        T_iinc_2_w t = new T_iinc_2_w();
-        assertEquals(3, t.run(4));
-    }
-
-    /**
-     * @title  Increment by 7763
-     */
-    public void testN6() {
-        T_iinc_3_w t = new T_iinc_3_w();
-        assertEquals(7767, t.run(4));
-    }
-
-    /**
-     * @title  Increment by 0
-     */
-    public void testB8() {
-        T_iinc_4_w t = new T_iinc_4_w();
-        assertEquals(Integer.MAX_VALUE, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Increment by 0
-     */
-    public void testB9() {
-        T_iinc_4_w t = new T_iinc_4_w();
-        assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Increment by 32767
-     */
-    public void testB10() {
-        T_iinc_5_w t = new T_iinc_5_w();
-        assertEquals(32768, t.run(1));
-    }
-
-    /**
-     * @title  Increment by 32767
-     */
-    public void testB11() {
-        T_iinc_5_w t = new T_iinc_5_w();
-        assertEquals(32766, t.run(-1));
-    }
-
-    /**
-     * @title  Increment by 32767
-     */
-    public void testB12() {
-        T_iinc_5_w t = new T_iinc_5_w();
-        assertEquals(-2147450881, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Increment by -32768
-     */
-    public void testB13() {
-        T_iinc_6_w t = new T_iinc_6_w();
-        assertEquals(-32767, t.run(1));
-    }
-
-    /**
-     * @title  Increment by -32768
-     */
-    public void testB14() {
-        T_iinc_6_w t = new T_iinc_6_w();
-        assertEquals(-32768, t.run(0));
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than
-     * max_locals-1.
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.iinc.jm.T_iinc_7_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be a nonnegative integer.
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.iinc.jm.T_iinc_8_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.iinc.jm.T_iinc_9_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.iinc.jm.T_iinc_10_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1.j
deleted file mode 100644
index 403078c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1.j
+++ /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 T_iinc_1.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iinc 1 1
-    iload_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1.java
deleted file mode 100644
index 9bcfb92..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_1 {
-
-    public int run(int a) {
-        return ++a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10.j
deleted file mode 100644
index 9d0dfed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iinc_10.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_10
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 2
-    .limit locals 4
-
-    lconst_1
-    lstore 2
-    iinc 2 1
-    iload_2
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10.java
deleted file mode 100644
index 6e0f42b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_10 {
-
-    public int run(int a) {
-        return ++a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10_w.j
deleted file mode 100644
index 82129ac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iinc_10_w.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_10_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 2
-    .limit locals 300
-
-    lconst_1
-    lstore 260
-    iinc 260 1
-    iload 260
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10_w.java
deleted file mode 100644
index cedfff7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_10_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_10_w {
-
-    public int run(int a) {
-        return ++a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1_w.j
deleted file mode 100644
index 5c88a81..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iinc_1.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 300
-    
-    iload_1
-    istore 270
-    iinc 270 1
-    iload 270
-    
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1_w.java
deleted file mode 100644
index 1f2348e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_1_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_1_w {
-
-    public int run(int a) {
-        return ++a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2.j
deleted file mode 100644
index 3faa1ce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iinc_2.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    iinc 1 -1
-    iload_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2.java
deleted file mode 100644
index e4b3725..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_2 {
-
-    public int run(int a) {
-        return --a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2_w.j
deleted file mode 100644
index 63ed027..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2_w.j
+++ /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_iinc_2_w.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_2_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 300
-
-    iload_1
-    istore 270
-    iinc 270 -1
-    iload 270
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2_w.java
deleted file mode 100644
index 952321f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_2_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_2_w {
-
-    public int run(int a) {
-        return --a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3.j
deleted file mode 100644
index f22fe25..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iinc_3.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    iinc 1 63
-    iload_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3.java
deleted file mode 100644
index 8b3f2e6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_3 {
-
-    public int run(int a) {
-        a += 63;
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3_w.j
deleted file mode 100644
index 69d795f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3_w.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iinc_3_w.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_3_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    iinc 1 7763
-    iload_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3_w.java
deleted file mode 100644
index 4da58fe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_3_w.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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_3_w {
-
-    public int run(int a) {
-        a += 7763;
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4.j
deleted file mode 100644
index e944fa3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4.j
+++ /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_iinc_4.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    iinc 1 0
-    iload_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4.java
deleted file mode 100644
index 33b93ea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_4 {
-
-    public int run(int a) {
-        a += 0;
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4_w.j
deleted file mode 100644
index cb5907e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iinc_4_w.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_4_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 3000
-
-    iload_1
-    istore 2500
-    iinc 2500 0
-    iload 2500
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4_w.java
deleted file mode 100644
index ea02795..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_4_w.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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_4_w {
-
-    public int run(int a) {
-        a += 0;
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5.j
deleted file mode 100644
index 4371611..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5.j
+++ /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_iinc_5.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 30
-
-    iload_1
-    istore 25
-    iinc 25 127
-    iload 25
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5.java
deleted file mode 100644
index bbeef43..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_5 {
-
-    public int run(int a) {
-        a += 127;
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5_w.j
deleted file mode 100644
index f3b9b52..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5_w.j
+++ /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_iinc_5_w.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_5_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 300
-
-    iload_1
-    istore 257
-    iinc 257 32767
-    iload 257
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5_w.java
deleted file mode 100644
index b80fab8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_5_w.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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_5_w {
-
-    public int run(int a) {
-        a += 32767;
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6.j
deleted file mode 100644
index caaf6ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6.j
+++ /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_iinc_6.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    iinc 1 -128
-    iload_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6.java
deleted file mode 100644
index f04d664..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_6 {
-
-     public int run(int a) {
-         a += -128;
-         return a;
-     }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6_w.j
deleted file mode 100644
index 5b004ac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6_w.j
+++ /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_iinc_6_w.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_6_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 300
-    
-    iload_1
-    istore 260
-
-    iinc 260 -32768
-    iload 260
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6_w.java
deleted file mode 100644
index 47a9fd1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_6_w.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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_6_w {
-
-     public int run(int a) {
-         a += -32768;
-         return a;
-     }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7.j
deleted file mode 100644
index acd3e81..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7.j
+++ /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_iinc_7.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    iinc 2 1
-    iload_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7.java
deleted file mode 100644
index 8915c15..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_7 {
-
-    public int run(int a) {
-        return ++a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7_w.j
deleted file mode 100644
index a885b87..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7_w.j
+++ /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_iinc_7_w.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_7_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 300
-
-    iinc 300 1
-    iload_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7_w.java
deleted file mode 100644
index dcdc59e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_7_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_7_w {
-
-    public int run(int a) {
-        return ++a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8.j
deleted file mode 100644
index 9af573f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8.j
+++ /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_iinc_8.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    iinc -2 1
-    iload_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8.java
deleted file mode 100644
index 90b3421..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_8 {
-
-    public int run(int a) {
-        return ++a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8_w.j
deleted file mode 100644
index 6ba8c0a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8_w.j
+++ /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_iinc_8_w.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_8_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    iinc -2 32001
-    iload_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8_w.java
deleted file mode 100644
index 2d4fd16..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_8_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_8_w {
-
-    public int run(int a) {
-        return ++a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9.j
deleted file mode 100644
index d41db14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iinc_9.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 2
-    .limit locals 4
-
-    dconst_1
-    dstore 2
-    iinc 2 1
-    iload_2
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9.java
deleted file mode 100644
index 64c04d9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_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 dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_9 {
-
-    public int run(int a) {
-        return ++a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9_w.j
deleted file mode 100644
index 09efab5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iinc_9_w.java
-.class public dxc/junit/opcodes/iinc/jm/T_iinc_9_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 2
-    .limit locals 300
-
-    dconst_1
-    dstore 260
-    iinc 260 1
-    iload 260
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9_w.java
deleted file mode 100644
index f2f6934..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iinc/jm/T_iinc_9_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iinc.jm;
-
-public class T_iinc_9_w {
-
-    public int run(int a) {
-        return ++a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/Test_iload.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/Test_iload.java
deleted file mode 100644
index 71cf115..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/Test_iload.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 dxc.junit.opcodes.iload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iload.jm.T_iload_1;
-import dxc.junit.opcodes.iload.jm.T_iload_1_w;
-import dxc.junit.opcodes.iload.jm.T_iload_2;
-import dxc.junit.opcodes.iload.jm.T_iload_2_w;
-
-public class Test_iload extends DxTestCase {
-
-    /*
-     * NORMAL ILOAD VERSION
-     */
-
-    /**
-     * @title  Test iload 1
-     */
-    public void testN1() {
-        T_iload_1 t = new T_iload_1();
-        assertEquals(4, t.run());
-    }
-
-    /**
-     * @title  Test iload 255
-     */
-    public void testN2() {
-        T_iload_2 t = new T_iload_2();
-        assertEquals(3, t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.21
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload.jm.T_iload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload.jm.T_iload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload.jm.T_iload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload.jm.T_iload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE ILOAD VERSION
-     */
-
-    /**
-     * @title  Test iload 257
-     */
-    public void testN3() {
-        T_iload_1_w t = new T_iload_1_w();
-        assertEquals(4, t.run());
-    }
-
-    /**
-     * @title  Test iload_w 1
-     */
-    public void testN4() {
-        T_iload_2_w t = new T_iload_2_w();
-        assertEquals(3, t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload.jm.T_iload_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload.jm.T_iload_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload.jm.T_iload_5_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload.jm.T_iload_6_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1.j
deleted file mode 100644
index 3083ee0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1.j
+++ /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_iload_1.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 2
-    .limit locals 6
-    
-    iconst_4
-    istore 4
-    iconst_3
-    iload 4
-    
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1.java
deleted file mode 100644
index 9bef2f2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_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 dxc.junit.opcodes.iload.jm;
-
-public class T_iload_1 {
-
-    public int run() {
-        return 4;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1_w.j
deleted file mode 100644
index 9e31e93..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1_w.j
+++ /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_iload_1_w.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_1_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 2
-    .limit locals 300
-    
-    iconst_4
-    istore 257
-    iconst_3
-    iload 257
-    
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1_w.java
deleted file mode 100644
index 57842b5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_1_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iload.jm;
-
-public class T_iload_1_w {
-
-    public int run() {
-        return 4;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2.j
deleted file mode 100644
index dfbad28..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2.j
+++ /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_iload_2.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 2
-    .limit locals 300
-    
-    iconst_3
-    istore 255
-    iconst_2
-    iload 255
-    
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2.java
deleted file mode 100644
index c75bf95..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_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 dxc.junit.opcodes.iload.jm;
-
-public class T_iload_2 {
-
-      public int run() {
-            return 3;
-        }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2_w.j
deleted file mode 100644
index d11251f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2_w.j
+++ /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_iload_2_w.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_2_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 2
-    .limit locals 2
-    
-    iconst_3
-    istore 1
-    iconst_2
-    iload_w 1
-    
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2_w.java
deleted file mode 100644
index fe5b114..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_2_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iload.jm;
-
-public class T_iload_2_w {
-
-      public int run() {
-            return 3;
-        }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3.j
deleted file mode 100644
index eaa2990..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iload_3.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    iload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3.java
deleted file mode 100644
index 36e8376..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3.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 dxc.junit.opcodes.iload.jm;
-
-public class T_iload_3 {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3_w.j
deleted file mode 100644
index 9e892c3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iload_3_w.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_3_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 300
-
-    iload 300
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3_w.java
deleted file mode 100644
index 6bf6191..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_3_w.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 dxc.junit.opcodes.iload.jm;
-
-public class T_iload_3_w {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4.j
deleted file mode 100644
index 318a2a3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4.j
+++ /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_iload_4.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_0
-    
-    iload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4.java
deleted file mode 100644
index 1fe18fa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_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 dxc.junit.opcodes.iload.jm;
-
-public class T_iload_4 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4_w.j
deleted file mode 100644
index 541c077..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4_w.j
+++ /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_iload_4_w.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_4_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 300
-
-    dconst_1
-    dstore 260
-    
-    iload_w 260
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4_w.java
deleted file mode 100644
index c293b5a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_4_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iload.jm;
-
-public class T_iload_4_w {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5.j
deleted file mode 100644
index 7bf6e93..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5.j
+++ /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_iload_5.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_0
-    
-    iload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5.java
deleted file mode 100644
index 67cb0a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_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 dxc.junit.opcodes.iload.jm;
-
-public class T_iload_5 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5_w.j
deleted file mode 100644
index 91208fd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5_w.j
+++ /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_iload_5_w.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_5_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 300
-
-    lconst_1
-    lstore 260
-    
-    iload_w 260
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5_w.java
deleted file mode 100644
index 78882d0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_5_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iload.jm;
-
-public class T_iload_5_w {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6.j
deleted file mode 100644
index 9363f54..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6.j
+++ /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_iload_6.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    iconst_1
-    istore_0
-    
-    iload 0
-    iload 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6.java
deleted file mode 100644
index 4b0ca5e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_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 dxc.junit.opcodes.iload.jm;
-
-public class T_iload_6 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6_w.j b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6_w.j
deleted file mode 100644
index dd93b27..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6_w.j
+++ /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_iload_6_w.java
-.class public dxc/junit/opcodes/iload/jm/T_iload_6_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 300
-
-    iconst_1
-    istore 260
-    
-    iload_w 260
-    iload_w 260
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6_w.java b/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6_w.java
deleted file mode 100644
index f5e118b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload/jm/T_iload_6_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iload.jm;
-
-public class T_iload_6_w {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/Test_iload_0.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/Test_iload_0.java
deleted file mode 100644
index ffb8684..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/Test_iload_0.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iload_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iload_0.jm.T_iload_0_1;
-import dxc.junit.opcodes.iload_0.jm.T_iload_0_6;
-
-public class Test_iload_0 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(3, T_iload_0_1.run());
-    }
-
-    /**
-     * @title  equality of iload_<n> and iload <n>
-     */
-    public void testN2() {
-        assertTrue(T_iload_0_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_0.jm.T_iload_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_0.jm.T_iload_0_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_0.jm.T_iload_0_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_0.jm.T_iload_0_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_1.j
deleted file mode 100644
index 3aa9a54..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iload_0_1.java
-.class public dxc/junit/opcodes/iload_0/jm/T_iload_0_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 1
-    
-    iconst_3
-    istore_0
-    iconst_4
-    iload_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_1.java
deleted file mode 100644
index 1cb2ba3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_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 dxc.junit.opcodes.iload_0.jm;
-
-public class T_iload_0_1 {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_2.j
deleted file mode 100644
index 703b886..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iload_0_2.java
-.class public dxc/junit/opcodes/iload_0/jm/T_iload_0_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    iload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_2.java
deleted file mode 100644
index c3c2c76..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_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 dxc.junit.opcodes.iload_0.jm;
-
-public class T_iload_0_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_3.j
deleted file mode 100644
index 2b1af46..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_3.j
+++ /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_iload_0_3.java
-.class public dxc/junit/opcodes/iload_0/jm/T_iload_0_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_0
-    
-    iload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_3.java
deleted file mode 100644
index 801d3ba..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_3.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 dxc.junit.opcodes.iload_0.jm;
-
-public class T_iload_0_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_4.j
deleted file mode 100644
index 3df46a9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_4.j
+++ /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_iload_0_4.java
-.class public dxc/junit/opcodes/iload_0/jm/T_iload_0_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_0
-    
-    iload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_4.java
deleted file mode 100644
index c92ee08..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_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 dxc.junit.opcodes.iload_0.jm;
-
-public class T_iload_0_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_5.j
deleted file mode 100644
index 9505ede..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_5.j
+++ /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_iload_0_5.java
-.class public dxc/junit/opcodes/iload_0/jm/T_iload_0_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    iconst_1
-    istore_0
-    
-    iload_0
-    iload_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_5.java
deleted file mode 100644
index b86d61f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_5.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 dxc.junit.opcodes.iload_0.jm;
-
-public class T_iload_0_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_6.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_6.j
deleted file mode 100644
index 8029a62..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_6.j
+++ /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_iload_0_6.java
-.class public dxc/junit/opcodes/iload_0/jm/T_iload_0_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 1
-
-    iconst_4
-    istore_0
-
-    iload_0
-    iload 0
-    if_icmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_6.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_6.java
deleted file mode 100644
index 9c12736..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_0/jm/T_iload_0_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 dxc.junit.opcodes.iload_0.jm;
-
-public class T_iload_0_6 {
-
-    public static boolean run() {
-        int i = 4;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/Test_iload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/Test_iload_1.java
deleted file mode 100644
index a41ed26..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/Test_iload_1.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iload_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iload_1.jm.T_iload_1_1;
-import dxc.junit.opcodes.iload_1.jm.T_iload_1_6;
-
-public class Test_iload_1 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(3, T_iload_1_1.run());
-    }
-
-    /**
-     * @title equality of iload_<n> and iload <n>
-     */
-    public void testN2() {
-        assertTrue(T_iload_1_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_1.jm.T_iload_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_1.jm.T_iload_1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_1.jm.T_iload_1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_1.jm.T_iload_1_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_1.j
deleted file mode 100644
index 79c23dc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iload_1_1.java
-.class public dxc/junit/opcodes/iload_1/jm/T_iload_1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 2
-    
-    iconst_3
-    istore_1
-    iconst_4
-    iload_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_1.java
deleted file mode 100644
index 2ecc1ea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_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 dxc.junit.opcodes.iload_1.jm;
-
-public class T_iload_1_1 {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_2.j
deleted file mode 100644
index 8b5e52f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iload_1_2.java
-.class public dxc/junit/opcodes/iload_1/jm/T_iload_1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    iload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_2.java
deleted file mode 100644
index f7fcd5e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_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 dxc.junit.opcodes.iload_1.jm;
-
-public class T_iload_1_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_3.j
deleted file mode 100644
index 63d1216..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_3.j
+++ /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_iload_1_3.java
-.class public dxc/junit/opcodes/iload_1/jm/T_iload_1_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_1
-    
-    iload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_3.java
deleted file mode 100644
index 48dc77c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_3.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 dxc.junit.opcodes.iload_1.jm;
-
-public class T_iload_1_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_4.j
deleted file mode 100644
index aebcb4a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_4.j
+++ /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_iload_1_4.java
-.class public dxc/junit/opcodes/iload_1/jm/T_iload_1_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    lstore_1
-    
-    iload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_4.java
deleted file mode 100644
index a7fc0d1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_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 dxc.junit.opcodes.iload_1.jm;
-
-public class T_iload_1_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_5.j
deleted file mode 100644
index 9dc1a4f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_5.j
+++ /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_iload_1_5.java
-.class public dxc/junit/opcodes/iload_1/jm/T_iload_1_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    iconst_1
-    istore_1
-    
-    iload_1
-    iload_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_5.java
deleted file mode 100644
index e9bd6c4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_5.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 dxc.junit.opcodes.iload_1.jm;
-
-public class T_iload_1_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_6.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_6.j
deleted file mode 100644
index 019b7a1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_6.j
+++ /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_iload_1_6.java
-.class public dxc/junit/opcodes/iload_1/jm/T_iload_1_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 2
-
-    iconst_4
-    istore_1
-
-    iload_1
-    iload 1
-    if_icmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_6.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_6.java
deleted file mode 100644
index 37f65c2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_1/jm/T_iload_1_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 dxc.junit.opcodes.iload_1.jm;
-
-public class T_iload_1_6 {
-
-    public static boolean run() {
-        int i = 4;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/Test_iload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/Test_iload_2.java
deleted file mode 100644
index b42cc97..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/Test_iload_2.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iload_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iload_2.jm.T_iload_2_1;
-import dxc.junit.opcodes.iload_2.jm.T_iload_2_6;
-
-public class Test_iload_2 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(3, T_iload_2_1.run());
-    }
-
-    /**
-     * @title equality of iload_<n> and iload <n>
-     */
-    public void testN2() {
-        assertTrue(T_iload_2_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_2.jm.T_iload_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_2.jm.T_iload_2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_2.jm.T_iload_2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_2.jm.T_iload_2_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_1.j
deleted file mode 100644
index 4b4acb6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iload_2_1.java
-.class public dxc/junit/opcodes/iload_2/jm/T_iload_2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 3
-    
-    iconst_3
-    istore_2
-    iconst_4
-    iload_2
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_1.java
deleted file mode 100644
index a348490..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_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 dxc.junit.opcodes.iload_2.jm;
-
-public class T_iload_2_1 {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_2.j
deleted file mode 100644
index aea12fc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iload_2_2.java
-.class public dxc/junit/opcodes/iload_2/jm/T_iload_2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    iload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_2.java
deleted file mode 100644
index 5ebd62f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_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 dxc.junit.opcodes.iload_2.jm;
-
-public class T_iload_2_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_3.j
deleted file mode 100644
index e3731cc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_3.j
+++ /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_iload_2_3.java
-.class public dxc/junit/opcodes/iload_2/jm/T_iload_2_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 6
-
-    dconst_1
-    dstore_2
-    
-    iload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_3.java
deleted file mode 100644
index 72149ef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_3.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 dxc.junit.opcodes.iload_2.jm;
-
-public class T_iload_2_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_4.j
deleted file mode 100644
index 18b80f1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_4.j
+++ /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_iload_2_4.java
-.class public dxc/junit/opcodes/iload_2/jm/T_iload_2_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 6
-
-    lconst_1
-    lstore_2
-    
-    iload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_4.java
deleted file mode 100644
index 904c14c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_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 dxc.junit.opcodes.iload_2.jm;
-
-public class T_iload_2_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_5.j
deleted file mode 100644
index 4390cbb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_5.j
+++ /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_iload_2_5.java
-.class public dxc/junit/opcodes/iload_2/jm/T_iload_2_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 4
-
-    iconst_1
-    istore_2
-    
-    iload_2
-    iload_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_5.java
deleted file mode 100644
index db95cae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_5.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 dxc.junit.opcodes.iload_2.jm;
-
-public class T_iload_2_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_6.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_6.j
deleted file mode 100644
index 8ca7a9e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_6.j
+++ /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_iload_2_6.java
-.class public dxc/junit/opcodes/iload_2/jm/T_iload_2_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 3
-
-    iconst_4
-    istore_2
-
-    iload_2
-    iload 2
-    if_icmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_6.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_6.java
deleted file mode 100644
index 737eb18..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_2/jm/T_iload_2_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 dxc.junit.opcodes.iload_2.jm;
-
-public class T_iload_2_6 {
-
-    public static boolean run() {
-        int i = 4;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/Test_iload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/Test_iload_3.java
deleted file mode 100644
index ac47b59..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/Test_iload_3.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.iload_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iload_3.jm.T_iload_3_1;
-import dxc.junit.opcodes.iload_3.jm.T_iload_3_6;
-
-public class Test_iload_3 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(3, T_iload_3_1.run());
-    }
-
-    /**
-     * @title equality of iload_<n> and iload <n>
-     */
-    public void testN2() {
-        assertTrue(T_iload_3_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_3.jm.T_iload_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_3.jm.T_iload_3_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_3.jm.T_iload_3_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iload_3.jm.T_iload_3_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_1.j
deleted file mode 100644
index 8b18818..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iload_3_1.java
-.class public dxc/junit/opcodes/iload_3/jm/T_iload_3_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 4
-    
-    iconst_3
-    istore_3
-    iconst_4
-    iload_3
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_1.java
deleted file mode 100644
index 88b4b61..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_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 dxc.junit.opcodes.iload_3.jm;
-
-public class T_iload_3_1 {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_2.j
deleted file mode 100644
index 6e75ed3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iload_3_2.java
-.class public dxc/junit/opcodes/iload_3/jm/T_iload_3_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    iload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_2.java
deleted file mode 100644
index 4ad7106..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_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 dxc.junit.opcodes.iload_3.jm;
-
-public class T_iload_3_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_3.j
deleted file mode 100644
index 8bc3a02..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_3.j
+++ /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_iload_3_3.java
-.class public dxc/junit/opcodes/iload_3/jm/T_iload_3_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 6
-
-    dconst_1
-    dstore_3
-    
-    iload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_3.java
deleted file mode 100644
index 8660cab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_3.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 dxc.junit.opcodes.iload_3.jm;
-
-public class T_iload_3_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_4.j
deleted file mode 100644
index cdd2fa8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_4.j
+++ /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_iload_3_4.java
-.class public dxc/junit/opcodes/iload_3/jm/T_iload_3_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 6
-
-    lconst_1
-    lstore_3
-    
-    iload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_4.java
deleted file mode 100644
index 86fe370..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_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 dxc.junit.opcodes.iload_3.jm;
-
-public class T_iload_3_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_5.j
deleted file mode 100644
index 94aeec4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_5.j
+++ /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_iload_3_5.java
-.class public dxc/junit/opcodes/iload_3/jm/T_iload_3_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 3
-
-    iconst_1
-    istore_3
-    
-    iload_3
-    iload_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_5.java
deleted file mode 100644
index 8604dce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_5.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 dxc.junit.opcodes.iload_3.jm;
-
-public class T_iload_3_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_6.j b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_6.j
deleted file mode 100644
index 9267b43..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_6.j
+++ /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_iload_3_6.java
-.class public dxc/junit/opcodes/iload_3/jm/T_iload_3_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 4
-
-    iconst_4
-    istore_3
-
-    iload_3
-    iload 3
-    if_icmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_6.java b/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_6.java
deleted file mode 100644
index 28d17a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iload_3/jm/T_iload_3_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 dxc.junit.opcodes.iload_3.jm;
-
-public class T_iload_3_6 {
-
-    public static boolean run() {
-        int i = 4;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/Test_imul.java b/tools/dx-tests/src/dxc/junit/opcodes/imul/Test_imul.java
deleted file mode 100644
index 2db80b6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/Test_imul.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 dxc.junit.opcodes.imul;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.imul.jm.T_imul_1;
-
-public class Test_imul extends DxTestCase {
-
-    /**
-     * @title Arguments = 8, 4
-     */
-    public void testN1() {
-        T_imul_1 t = new T_imul_1();
-        assertEquals(32, t.run(8, 4));
-    }
-
-    /**
-     * @title Arguments = -2, 255
-     */
-    public void testN2() {
-        T_imul_1 t = new T_imul_1();
-        assertEquals(-510, t.run(-2, 255));
-    }
-
-    /**
-     * @title Arguments = 0x7ffffffe, 2
-     */
-    public void testN3() {
-        T_imul_1 t = new T_imul_1();
-        assertEquals(-4, t.run(0x7ffffffe, 2));
-    }
-
-    /**
-     * @title Arguments = 4, 0x80000001
-     */
-    public void testN4() {
-        T_imul_1 t = new T_imul_1();
-        assertEquals(4, t.run(4, 0x80000001));
-    }
-
-    /**
-     * @title Arguments = 0, Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_imul_1 t = new T_imul_1();
-        assertEquals(0, t.run(0, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title Arguments = Integer.MAX_VALUE, 1
-     */
-    public void testB2() {
-        T_imul_1 t = new T_imul_1();
-        assertEquals(Integer.MAX_VALUE, t.run(Integer.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title Arguments = Integer.MIN_VALUE, 1
-     */
-    public void testB3() {
-        T_imul_1 t = new T_imul_1();
-        assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE, 1));
-    }
-
-    /**
-     * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
-     */
-    public void testB4() {
-        T_imul_1 t = new T_imul_1();
-        assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE,
-                Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title Arguments = 0, 0
-     */
-    public void testB5() {
-        T_imul_1 t = new T_imul_1();
-        assertEquals(0, t.run(0, 0));
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.imul.jm.T_imul_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int / double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.imul.jm.T_imul_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.imul.jm.T_imul_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference / int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.imul.jm.T_imul_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_1.j b/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_1.j
deleted file mode 100644
index b3ba15a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_imul_1.java
-.class public dxc/junit/opcodes/imul/jm/T_imul_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    imul
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_1.java b/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_1.java
deleted file mode 100644
index 38b1298..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_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 dxc.junit.opcodes.imul.jm;
-
-public class T_imul_1 {
-
-    public int run(int a, int b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_2.j b/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_2.j
deleted file mode 100644
index d00f4e0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_imul_2.java
-.class public dxc/junit/opcodes/imul/jm/T_imul_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    ; iload_2    
-    imul
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_2.java b/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_2.java
deleted file mode 100644
index 123e230..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_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 dxc.junit.opcodes.imul.jm;
-
-public class T_imul_2 {
-
-    public int run(int a, int b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_3.j b/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_3.j
deleted file mode 100644
index 960c58c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_imul_3.java
-.class public dxc/junit/opcodes/imul/jm/T_imul_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(ID)I
-    .limit stack 3
-    .limit locals 5
-    iload_1
-    dload_2    
-    imul
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_3.java b/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_3.java
deleted file mode 100644
index cad2df6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_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 dxc.junit.opcodes.imul.jm;
-
-public class T_imul_3 {
-
-    public int run(int a, double b) {
-        return a+(int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_4.j b/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_4.j
deleted file mode 100644
index 73d7440..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_4.j
+++ /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_imul_4.java
-.class public dxc/junit/opcodes/imul/jm/T_imul_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JI)I
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-;    l2i
-    iload_3
-    imul
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_4.java b/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_4.java
deleted file mode 100644
index d2da8b7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_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 dxc.junit.opcodes.imul.jm;
-
-public class T_imul_4 {
-
-    public int run(long a, int b) {
-        return (int)a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_5.j b/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_5.j
deleted file mode 100644
index aa3a81a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_imul_5.java
-.class public dxc/junit/opcodes/imul/jm/T_imul_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    iadd
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_5.java b/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_5.java
deleted file mode 100644
index e4aa8e9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/imul/jm/T_imul_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 dxc.junit.opcodes.imul.jm;
-
-public class T_imul_5 {
-    
-    public int run(int a, int b) {
-        return a+b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/Test_ineg.java b/tools/dx-tests/src/dxc/junit/opcodes/ineg/Test_ineg.java
deleted file mode 100644
index 366a8a1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/Test_ineg.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 dxc.junit.opcodes.ineg;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ineg.jm.T_ineg_1;
-import dxc.junit.opcodes.ineg.jm.T_ineg_2;
-
-public class Test_ineg extends DxTestCase {
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN1() {
-        T_ineg_1 t = new T_ineg_1();
-        assertEquals(-1, t.run(1));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN2() {
-        T_ineg_1 t = new T_ineg_1();
-        assertEquals(1, t.run(-1));
-    }
-
-    /**
-     * @title  Argument = 32768
-     */
-    public void testN3() {
-        T_ineg_1 t = new T_ineg_1();
-        assertEquals(-32768, t.run(32768));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testN4() {
-        T_ineg_1 t = new T_ineg_1();
-        assertEquals(0, t.run(0));
-    }
-
-    /**
-     * @title  Check that -x == (~x + 1)
-     */
-    public void testN5() {
-        T_ineg_2 t = new T_ineg_2();
-        assertTrue(t.run(12345));
-    }
-
-    /**
-     * @title  Argument = Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_ineg_1 t = new T_ineg_1();
-        assertEquals(0x80000001, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_ineg_1 t = new T_ineg_1();
-        assertEquals(Integer.MIN_VALUE, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ineg.jm.T_ineg_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ineg.jm.T_ineg_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ineg.jm.T_ineg_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ineg.jm.T_ineg_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_1.j
deleted file mode 100644
index e124957..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_1.j
+++ /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 T_ineg_1.java
-.class public dxc/junit/opcodes/ineg/jm/T_ineg_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    ineg
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_1.java
deleted file mode 100644
index 3db9480..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_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 dxc.junit.opcodes.ineg.jm;
-
-public class T_ineg_1 {
-
-    public int run(int d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_2.j
deleted file mode 100644
index b4f2140..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_2.j
+++ /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_ineg_2.java
-.class public dxc/junit/opcodes/ineg/jm/T_ineg_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)Z
-    .limit stack 3
-    .limit locals 2
-
-    iload_1
-    ineg
-
-    iload_1
-    iconst_m1
-    ixor
-    iconst_1
-    iadd
-    if_icmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_2.java
deleted file mode 100644
index b9ee0b0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_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 dxc.junit.opcodes.ineg.jm;
-
-public class T_ineg_2 {
-
-     public boolean run(int d) {
-         return -d == (~d + 1);
-     }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_3.j
deleted file mode 100644
index e850c19..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_3.j
+++ /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 T_ineg_3.java
-.class public dxc/junit/opcodes/ineg/jm/T_ineg_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    ;iload_1
-    ineg
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_3.java
deleted file mode 100644
index 306154b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_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 dxc.junit.opcodes.ineg.jm;
-
-public class T_ineg_3 {
-
-    public int run(int d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_4.j
deleted file mode 100644
index 7f1d704..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_4.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ineg_4.java
-.class public dxc/junit/opcodes/ineg/jm/T_ineg_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 2
-    .limit locals 3
-    ;iload_1
-    dconst_1
-    ineg
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_4.java
deleted file mode 100644
index 8285cbd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_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 dxc.junit.opcodes.ineg.jm;
-
-public class T_ineg_4 {
-
-    public int run(int d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_5.j
deleted file mode 100644
index 8ec653d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_5.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ineg_5.java
-.class public dxc/junit/opcodes/ineg/jm/T_ineg_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 2
-    .limit locals 3
-    ;iload_1
-    lconst_1
-    ineg
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_5.java
deleted file mode 100644
index 48d4b14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_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 dxc.junit.opcodes.ineg.jm;
-
-public class T_ineg_5 {
-
-    public int run(int d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_6.j
deleted file mode 100644
index 8aa2e44..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_6.j
+++ /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_ineg_6.java
-.class public dxc/junit/opcodes/ineg/jm/T_ineg_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    ineg
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_6.java
deleted file mode 100644
index 901bcf4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ineg/jm/T_ineg_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 dxc.junit.opcodes.ineg.jm;
-
-public class T_ineg_6 {
-    
-    public int run(int d) {
-        return -d;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/Test_invokeinterface.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/Test_invokeinterface.java
deleted file mode 100644
index 9d27718..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/Test_invokeinterface.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokeinterface;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.invokeinterface.jm.ITestImpl;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_1;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_11;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_12;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_13;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_14;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_15;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_16;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_17;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_19;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_3;
-import dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_7;
-
-public class Test_invokeinterface extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_invokeinterface_1 t = new T_invokeinterface_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 invokeinterface and
-     * arguments are passed to method
-     */
-    public void testN2() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImpl
-        T_invokeinterface_14 t = new T_invokeinterface_14();
-        ITestImpl impl = new ITestImpl();
-        assertEquals(1, t.run(impl));
-    }
-
-    /**
-     * @title  Check that monitor is acquired if method is synchronized
-     */
-    public void testN3() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        assertTrue(T_invokeinterface_19.execute());
-    }
-
-
-    /**
-     * @title  method doesn't exist
-     */
-    public void testE1() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImpl
-        try {
-            T_invokeinterface_7 t = new T_invokeinterface_7();
-            ITestImpl impl = new ITestImpl();
-            t.run(impl);
-            fail("expected NoSuchMethodError");
-        } catch (NoSuchMethodError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  method has different signature
-     */
-    public void testE2() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImpl
-        try {
-            T_invokeinterface_16 t = new T_invokeinterface_16();
-            ITestImpl impl = new ITestImpl();
-            t.run(impl);
-            fail("expected NoSuchMethodError");
-        } catch (NoSuchMethodError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NullPointerException
-     */
-    public void testE3() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest        
-        try {
-            new T_invokeinterface_3(null);
-            fail("expected NullPointerException");
-        } catch (NullPointerException npe) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  object doesn't implement interface
-     */
-    public void testE4() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImpl
-        T_invokeinterface_11 t = new T_invokeinterface_11();
-        ITestImpl impl = new ITestImpl();
-        try {
-            t.run(impl);
-            fail("expected IncompatibleClassChangeError");
-        } catch (IncompatibleClassChangeError e) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Native method can't be linked
-     */
-    public void testE5() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImpl
-        T_invokeinterface_12 t = new T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm.ITest
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImplAbstract
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImpl
-        try {
-            T_invokeinterface_13 t = new T_invokeinterface_13();
-            ITestImpl impl = new ITestImpl();
-            t.run(impl);
-            fail("expected AbstractMethodError");
-        } catch (AbstractMethodError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Attempt to invoke static method
-     */
-    public void testE7() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImplAbstract
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImpl
-        try {
-            T_invokeinterface_15 t = new T_invokeinterface_15();
-            ITestImpl impl = new ITestImpl();
-            t.run(impl);
-            fail("expected AbstractMethodError");
-        } catch (AbstractMethodError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Attempt to invoke non-public interface method
-     */
-    public void testE8() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImplAbstract
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImpl
-        try {
-            T_invokeinterface_17 t = new T_invokeinterface_17();
-            ITestImpl impl = new ITestImpl();
-            t.run(impl);
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.15 
-     * @title valid index into constant pool table
-     */
-    public void testVFE1() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.15 
-     * @title invalid index into constant pool table
-     */
-    public void testVFE2() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_23");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1 
-     * @title number of arguments
-     */
-    public void testVFE5() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1 
-     * @title type of argument - int
-     */
-    public void testVFE6() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest        
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.15 
-     * @title args_size value must match number of arguments
-     */
-    public void testVFE7() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.15 
-     * @title 4th operand must be zero
-     */
-    public void testVFE8() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1 
-     * @title number of arguments passed to method
-     */
-    public void testVFE9() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14 
-     * @title only invokespecial may be used to call <init>
-     */
-    public void testVFE10() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITestImplAbstract        
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_18");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14 
-     * @title only invokespecial may be used to call <clinit>
-     */
-    public void testVFE11() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_20");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.12 
-     * @title types of arguments passed to method
-     */
-    public void testVFE12() {
-        //@uses dxc.junit.opcodes.invokeinterface.jm.ITest
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_21");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/ITest.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/ITest.java
deleted file mode 100644
index 080199a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/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 dxc.junit.opcodes.invokeinterface.jm;
-
-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/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/ITestImpl.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/ITestImpl.java
deleted file mode 100644
index fb20ecc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/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 dxc.junit.opcodes.invokeinterface.jm;
-
-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/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract.j
deleted file mode 100644
index 6ebe8bd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract.j
+++ /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 ITestImplAbstract.java
-.class public dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract
-.super java/lang/Object
-.implements dxc/junit/opcodes/invokeinterface/jm/ITest
-
-.method  <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public abstract doit()V
-.end method
-
-
-
-.method public static doit(I)V
-    .limit locals 2
-    return
-.end method
-
-
-
-.method public native doitNative()V
-.end method
-
-.method protected test(I)I
-    .limit locals 2
-    .limit stack 1
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract.java
deleted file mode 100644
index fdabd89..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract.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 dxc.junit.opcodes.invokeinterface.jm;
-
-abstract class ITestImplAbstract implements ITest {
-    abstract public void doit();
-    abstract public void doit(int i);
-    public native void doitNative();
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_1.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_1.j
deleted file mode 100644
index ca88c6c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_1.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
-    .limit stack 2
-    .limit locals 3
-    aload_1
-    aload_2
-    invokeinterface java/lang/Comparable/compareTo(Ljava/lang/Object;)I 2
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_1.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_1.java
deleted file mode 100644
index bb3a112..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_1 {
-
-    public int run(Comparable c, Object o) {
-        return c.compareTo(o);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_10.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_10.j
deleted file mode 100644
index 786446d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_10.j
+++ /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_invokeinterface_10.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_10
-.super java/lang/Object
-
-.method public <init>(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-;    aload_1
-    iconst_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit()V 1
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_10.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_10.java
deleted file mode 100644
index 5fe6f68..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_10 {
-
-    public T_invokeinterface_10 (ITest test) {
-        test.doit();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_11.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_11.j
deleted file mode 100644
index e4c7a8b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_11.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_11.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 1
-    .limit locals 2
-
-;    aload_1
-    aload_0
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit()V 1
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_11.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_11.java
deleted file mode 100644
index 916eeb3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_11 {
-
-    public void run(ITest test) {
-        test.doit();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_12.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_12.j
deleted file mode 100644
index fbd7d7e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_12.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_12.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_12
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 1
-    .limit locals 2
-
-    aload_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doitNative()V 1
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_12.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_12.java
deleted file mode 100644
index 3418fce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_12 {
-
-    public void run(ITest test) {
-        test.doitNative();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_13.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_13.j
deleted file mode 100644
index 7feb097..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_13.j
+++ /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_invokeinterface_13.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_13
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 2
-    .limit locals 2
-
-    new dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract
-    dup
-    invokespecial dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract/<init>()V
-    
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit()V 1
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_13.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_13.java
deleted file mode 100644
index e11df1f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_13 {
-
-    public void run(ITest test) {
-        test.doit();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_14.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_14.j
deleted file mode 100644
index 94a2710..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_14.j
+++ /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 T_invokeinterface_14.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_14
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)I
-    .limit stack 3
-    .limit locals 4
-
-    bipush 123
-    istore_2
-
-    sipush 345
-    istore_3
-
-    aload_1
-    sipush 64
-    sipush 2
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/testArgsOrder(II)I 3
-    sipush 32
-    if_icmpne Label0
-
-    iload_2
-    bipush 123
-    if_icmpne Label0
-
-    iload_3
-    sipush 345
-    if_icmpne Label0
-
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_14.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_14.java
deleted file mode 100644
index 4ebf2f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_14.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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_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/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_15.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_15.j
deleted file mode 100644
index 67f5ffb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_15.j
+++ /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_invokeinterface_15.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_15
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 2
-    .limit locals 2
-
-    new dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract
-    dup
-    invokespecial dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract/<init>()V
-    
-    iconst_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit(I)V 2
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_15.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_15.java
deleted file mode 100644
index c4aba4c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_15.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_15 {
-
-    public void run(ITest test) {
-        test.doit();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_16.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_16.j
deleted file mode 100644
index 796696a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_16.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_16.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_16
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 2
-    .limit locals 2
-
-    aload_1
-    fconst_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit(F)V 2
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_16.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_16.java
deleted file mode 100644
index 161aafe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_16 {
-
-    public void run(ITest test) {
-        test.doit();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_17.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_17.j
deleted file mode 100644
index 38133af..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_17.j
+++ /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_invokeinterface_17.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_17
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 2
-    .limit locals 2
-
-    new dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract
-    dup
-    invokespecial dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract/<init>()V
-    
-    iconst_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/test(I)I 2
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_17.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_17.java
deleted file mode 100644
index c7754ea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_17 {
-
-    public void run(ITest test) {
-        test.test(1);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_18.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_18.j
deleted file mode 100644
index 674e491..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_18.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_18.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_18
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 2
-    .limit locals 2
-    
-    new dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract
-    dup
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITestImplAbstract/<init>()V 1
-    
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_18.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_18.java
deleted file mode 100644
index 12462fb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_18.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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_18 {
-
-    public void run(ITest test) {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_19.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_19.j
deleted file mode 100644
index f5a89a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_19.j
+++ /dev/null
@@ -1,182 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_19.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_19
-.super java/lang/Object
-.implements java/lang/Runnable
-.implements dxc/junit/opcodes/invokeinterface/jm/ITest
-
-.field  value I
-.field  failed Z
-
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_19.value I
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_19.failed Z
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-
-    iconst_0
-    istore_1
-
-Label1:
-
-    aload_0
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit()V 1
-
-    iinc 1 1
-
-    iload_1
-    sipush 1000
-    if_icmplt Label1
-
-    return
-.end method
-
-
-
-.method public synchronized doit()V
-    .limit stack 3
-    .limit locals 2
-
-    
-    aload_0
-    dup
-    getfield dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_19.value I
-    iconst_1
-    iadd
-    putfield dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_19.value I
-
-    aload_0
-    getfield dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_19.value I
-    istore_1
-
-    invokestatic java/lang/Thread/yield()V
-
-    iload_1
-    aload_0
-    getfield dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_19.value I
-    if_icmpeq Label0
-
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_19.failed Z
-
-    Label0:
-    return
-.end method
-
-
-
-.method public doit(I)V
-    .limit stack 0
-    .limit locals 2
-    return
-.end method
-
-.method public doitNative()V
-    .limit stack 0
-    .limit locals 1
-    return
-.end method
-
-.method public test(I)I
-    .limit stack 1
-    .limit locals 2
-    iconst_0
-    ireturn
-.end method
-
-
-
-.method public static execute()Z
-    .limit stack 3
-    .limit locals 4
-
-    new dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_19
-    dup
-    invokespecial dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_19/<init>()V
-    astore_0
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_1
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_2
-
-    aload_1
-    invokevirtual java/lang/Thread/start()V
-
-    aload_2
-    invokevirtual java/lang/Thread/start()V
-
-Label12:
-    ldc2_w 5000
-    invokestatic java/lang/Thread/sleep(J)V
-
-Label13:
-    goto Label0
-
-Label14:
-    astore_3
-    iconst_0
-    ireturn
-
-Label0:
-    aload_0
-    getfield dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_19.value I
-    sipush 2000
-    if_icmpeq Label1
-
-    iconst_0
-    ireturn
-
-Label1:
-    aload_0
-    getfield dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_19.failed Z
-    ifeq Label2
-    iconst_0
-    ireturn
-
-Label2:
-    iconst_1
-    ireturn
-
-.catch java/lang/InterruptedException from Label12 to Label13 using Label14
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_19.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_19.java
deleted file mode 100644
index 1aec95b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_19.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 dxc.junit.opcodes.invokeinterface.jm;
-
-
-public class T_invokeinterface_19 implements Runnable, ITest {
-    public final static int CNT = 1000;
-    int value = 0;
-    boolean failed = false;
-    
-    public void run() {
-        for(int i = 0; i < CNT; i++) {
-            doit();
-        }
-    }
-    
-    public synchronized void doit(){
-        value++;
-        int c = value;
-        Thread.yield();
-        if(c != value)
-            failed = true;
-    }
-    public void doit(int i){
-    }
-    public void doitNative(){
-    }
-    public  int test(int a) {
-        return 0;
-    }
-    public int testArgsOrder(int a, int b){
-        return 0;
-    }
-    
-    public static boolean execute() {
-        T_invokeinterface_19 test = new T_invokeinterface_19();
-        Thread t1 = new Thread(test);
-        Thread t2 = new Thread(test);
-        
-        t1.start();
-        t2.start();
-        
-        try
-        {
-            Thread.sleep(5000);
-        }
-        catch(InterruptedException ie) {
-            return false;
-        }
-        
-        if(test.value != CNT * 2)
-            return false;
-        return !test.failed;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2.cfh b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2.cfh
deleted file mode 100644
index b91b025..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2.cfh
+++ /dev/null
@@ -1,155 +0,0 @@
-//@class:dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: ifaceMethod{dxc.junit.opcodes.invokeinterface.jm.ITest.doit:()V}
-    // .  .  .  .  .  
-       0b 00 08 00 0f 
-    // parsed:, offset 15, len 5, h: 0002: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 11 00 09 
-    // parsed:, offset 20, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 39, len 3, h: 0004: type{dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_2}
-    // .  .  .  
-       07 00 10 
-    // parsed:, offset 42, len 13, h: 0005: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 55, len 27, h: 0006: utf8{"T_invokeinterface_2.java"}
-    // .  .  .  T  _  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  _  2  .  j  a  v  a  
-       01 00 18 54 5f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 5f 32 2e 6a 61 76 61 
-    // parsed:, offset 82, len 9, h: 0007: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 91, len 3, h: 0008: type{dxc.junit.opcodes.invokeinterface.jm.ITest}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 94, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 07 00 0e 
-    // parsed:, offset 99, len 7, h: 000a: utf8{"doit"}
-    // .  .  .  d  o  i  t  
-       01 00 04 64 6f 69 74 
-    // parsed:, offset 106, len 45, h: 000b: utf8{"dxc/junit/opcodes/invokeinterface/jm/ITest"}
-    // .  .  *  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  I  T  e  s  t  
-       01 00 2a 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 49 54 65 73 74 
-    // parsed:, offset 151, len 7, h: 000c: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 158, len 50, h: 000d: utf8{"(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V"}
-    // .  .  /  (  L  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  I  T  e  s  t  ;  )  V  
-       01 00 2f 28 4c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 49 54 65 73 74 3b 29 56 
-    // parsed:, offset 208, len 6, h: 000e: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 214, len 5, h: 000f: nat{doit:()V}
-    // .  .  .  .  .  
-       0c 00 0a 00 0e 
-    // parsed:, offset 219, len 59, h: 0010: utf8{"dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2"}
-    // .  .  8  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  T  _  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  _  2  
-       01 00 38 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 54 5f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 5f 32 
-    // parsed:, offset 278, len 3, h: 0011: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 281, len 0, h: end constant_pool
-// parsed:, offset 281, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 283, len 2, h: this_class: type{dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_2}
-// .  .  
-   00 04 
-// parsed:, offset 285, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 11 
-// parsed:, offset 287, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 289, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 291, len 2, h: methods_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:<init>, offset 293, len:47,desc: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-// parsed:, offset 293, len 0, h:  methods[0]: 
-    // parsed:, offset 293, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 295, len 2, h: name: <init>
-    // .  .  
-       00 07 
-    // parsed:, offset 297, len 2, h: descriptor: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    // .  .  
-       00 0d 
-    // parsed:, offset 299, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 301, len 0, h:  attributes[0]: 
-        // parsed:, offset 301, len 2, h: name: Code
-        // .  .  
-           00 0c 
-        // parsed:, offset 303, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 307, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 309, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 311, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 02 
-        // parsed:, offset 4, len 1, h: 0004: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 5, len 5, h: 0005: invokeinterface ifaceMethod{dxc.junit.opcodes.invokeinterface.jm.ITest.doit:()V}, 0001
-        // .  .  .  .  .  
-//@mod:    b9 00 01 01 00 
-           b9 00 02 01 00 
-        // parsed:, offset 10, len 1, h: 000a: return
-        // .  
-           b1 
-        // parsed:, offset 326, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 328, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 330, len 0, h: end attributes[0] 
-// parsed:, offset 330, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-// parsed:, offset 330, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 332, len 0, h:  attributes[0]: 
-    // parsed:, offset 332, len 2, h: name: SourceFile
-    // .  .  
-       00 05 
-    // parsed:, offset 334, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 338, len 2, h: source: utf8{"T_invokeinterface_2.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 340, len 0, h: end attributes[0] 
-// parsed:, offset 340, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2.j
deleted file mode 100644
index 2d3fafc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2.j
+++ /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_invokeinterface_2.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2
-.super java/lang/Object
-
-.method public <init>(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit()V 1
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_2.java
deleted file mode 100644
index 6fe011f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_2 {
-
-    public T_invokeinterface_2 (ITest test) {
-        test.doit();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_20.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_20.j
deleted file mode 100644
index 6da973f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_20.j
+++ /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_invokeinterface_20.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_20
-.super java/lang/Object
-
-.field public static i I
-
-.method static <clinit>()V
-    .limit stack 1
-    iconst_0
-    putstatic dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_20.i I
-    return
-.end method
-
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 1
-    .limit locals 2
-    
-    aload_0
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_20/<clinit>()V 1
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_20.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_20.java
deleted file mode 100644
index 4487726..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_20.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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_20 {
-
-    public static int i = 0;
-    
-    public void run(ITest test) {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_21.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_21.j
deleted file mode 100644
index 9d28bbf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_21.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_21.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_21
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 3
-    .limit locals 2
-
-    aload_1
-    lconst_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit(I)V 2
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_21.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_21.java
deleted file mode 100644
index 0897987..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_21 {
-
-    public void run(ITest test) {
-        test.doit(1);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23.cfh b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23.cfh
deleted file mode 100644
index 57b9e09..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23.cfh
+++ /dev/null
@@ -1,155 +0,0 @@
-//@class:dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: ifaceMethod{dxc.junit.opcodes.invokeinterface.jm.ITest.doit:()V}
-    // .  .  .  .  .  
-       0b 00 06 00 10 
-    // parsed:, offset 15, len 5, h: 0002: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 11 00 07 
-    // parsed:, offset 20, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 39, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 52, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 61, len 3, h: 0006: type{dxc.junit.opcodes.invokeinterface.jm.ITest}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 64, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0d 
-    // parsed:, offset 69, len 7, h: 0008: utf8{"doit"}
-    // .  .  .  d  o  i  t  
-       01 00 04 64 6f 69 74 
-    // parsed:, offset 76, len 45, h: 0009: utf8{"dxc/junit/opcodes/invokeinterface/jm/ITest"}
-    // .  .  *  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  I  T  e  s  t  
-       01 00 2a 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 49 54 65 73 74 
-    // parsed:, offset 121, len 3, h: 000a: type{dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_23}
-    // .  .  .  
-       07 00 0e 
-    // parsed:, offset 124, len 7, h: 000b: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 131, len 50, h: 000c: utf8{"(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V"}
-    // .  .  /  (  L  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  I  T  e  s  t  ;  )  V  
-       01 00 2f 28 4c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 49 54 65 73 74 3b 29 56 
-    // parsed:, offset 181, len 6, h: 000d: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 187, len 60, h: 000e: utf8{"dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23"}
-    // .  .  9  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  T  _  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  _  2  3  
-       01 00 39 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 54 5f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 5f 32 33 
-    // parsed:, offset 247, len 28, h: 000f: utf8{"T_invokeinterface_23.java"}
-    // .  .  .  T  _  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  _  2  3  .  j  a  v  a  
-       01 00 19 54 5f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 5f 32 33 2e 6a 61 76 61 
-    // parsed:, offset 275, len 5, h: 0010: nat{doit:()V}
-    // .  .  .  .  .  
-       0c 00 08 00 0d 
-    // parsed:, offset 280, len 3, h: 0011: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 283, len 0, h: end constant_pool
-// parsed:, offset 283, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 285, len 2, h: this_class: type{dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_23}
-// .  .  
-   00 0a 
-// parsed:, offset 287, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 11 
-// parsed:, offset 289, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 291, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 293, len 2, h: methods_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:<init>, offset 295, len:47,desc: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-// parsed:, offset 295, len 0, h:  methods[0]: 
-    // parsed:, offset 295, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 297, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 299, len 2, h: descriptor: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    // .  .  
-       00 0c 
-    // parsed:, offset 301, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 303, len 0, h:  attributes[0]: 
-        // parsed:, offset 303, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 305, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 309, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 311, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 313, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 02 
-        // parsed:, offset 4, len 1, h: 0004: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 5, len 5, h: 0005: invokeinterface ifaceMethod{dxc.junit.opcodes.invokeinterface.jm.ITest.doit:()V}, 0001
-        // .  .  .  .  .  
-//@mod           b9 00 01 01 00 
-           b9 01 01 01 00 
-        // parsed:, offset 10, len 1, h: 000a: return
-        // .  
-           b1 
-        // parsed:, offset 328, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 330, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 332, len 0, h: end attributes[0] 
-// parsed:, offset 332, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-// parsed:, offset 332, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 334, len 0, h:  attributes[0]: 
-    // parsed:, offset 334, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 336, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 340, len 2, h: source: utf8{"T_invokeinterface_23.java"}
-    // .  .  
-       00 0f 
-// parsed:, offset 342, len 0, h: end attributes[0] 
-// parsed:, offset 342, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23.j
deleted file mode 100644
index 6aa596f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23.j
+++ /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_invokeinterface_23.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23
-.super java/lang/Object
-
-.method public <init>(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit()V 1
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23.java
deleted file mode 100644
index da54e21..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_23.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_23 {
-
-    public T_invokeinterface_23 (ITest test) {
-        test.doit();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_3.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_3.j
deleted file mode 100644
index d1d46c1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_3.j
+++ /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_invokeinterface_3.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_3
-.super java/lang/Object
-
-.method public <init>(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit locals 2
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit()V 1
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_3.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_3.java
deleted file mode 100644
index 5d85c5a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_3 {
-
-    public T_invokeinterface_3 (ITest test) {
-        test.doit();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_4.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_4.java
deleted file mode 100644
index fa92a23..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_4 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_5.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_5.j
deleted file mode 100644
index b3d3d59..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_5.j
+++ /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_invokeinterface_5.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_5
-.super java/lang/Object
-
-.method public <init>(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-;    aload_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit()V 1
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_5.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_5.java
deleted file mode 100644
index e80580d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_5 {
-
-    public T_invokeinterface_5 (ITest test) {
-        test.doit();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6.cfh
deleted file mode 100644
index 9d6c6f5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6.cfh
+++ /dev/null
@@ -1,206 +0,0 @@
-//@class:dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0014
-// .  .  
-   00 14 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 19, h: 0001: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 29, len 5, h: 0002: ifaceMethod{dxc.junit.opcodes.invokeinterface.jm.ITest.doit:(I)V}
-    // .  .  .  .  .  
-       0b 00 06 00 0a 
-    // parsed:, offset 34, len 9, h: 0003: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 43, len 3, h: 0004: type{java.lang.Object}
-    // .  .  .  
-       07 00 01 
-    // parsed:, offset 46, len 5, h: 0005: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 03 00 07 
-    // parsed:, offset 51, len 3, h: 0006: type{dxc.junit.opcodes.invokeinterface.jm.ITest}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 54, len 6, h: 0007: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 60, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 67, len 59, h: 0009: utf8{"dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6"}
-    // .  .  8  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  T  _  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  _  6  
-       01 00 38 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 54 5f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 5f 36 
-    // parsed:, offset 126, len 5, h: 000a: nat{doit:(I)V}
-    // .  .  .  .  .  
-       0c 00 0f 00 0d 
-    // parsed:, offset 131, len 45, h: 000b: utf8{"dxc/junit/opcodes/invokeinterface/jm/ITest"}
-    // .  .  *  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  I  T  e  s  t  
-       01 00 2a 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 49 54 65 73 74 
-    // parsed:, offset 176, len 13, h: 000c: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 189, len 7, h: 000d: utf8{"(I)V"}
-    // .  .  .  (  I  )  V  
-       01 00 04 28 49 29 56 
-    // parsed:, offset 196, len 6, h: 000e: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 202, len 7, h: 000f: utf8{"doit"}
-    // .  .  .  d  o  i  t  
-       01 00 04 64 6f 69 74 
-    // parsed:, offset 209, len 5, h: 0010: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 04 00 05 
-    // parsed:, offset 214, len 27, h: 0011: utf8{"T_invokeinterface_6.java"}
-    // .  .  .  T  _  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  _  6  .  j  a  v  a  
-       01 00 18 54 5f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 241, len 3, h: 0012: type{dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_6}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 244, len 50, h: 0013: utf8{"(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V"}
-    // .  .  /  (  L  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  I  T  e  s  t  ;  )  V  
-       01 00 2f 28 4c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 49 54 65 73 74 3b 29 56 
-// parsed:, offset 294, len 0, h: end constant_pool
-// parsed:, offset 294, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 296, len 2, h: this_class: type{dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_6}
-// .  .  
-   00 12 
-// parsed:, offset 298, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 04 
-// parsed:, offset 300, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 302, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 304, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 306, len:75,desc: ()V
-// parsed:, offset 306, len 0, h:  methods[0]: 
-    // parsed:, offset 306, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 308, len 2, h: name: <init>
-    // .  .  
-       00 03 
-    // parsed:, offset 310, len 2, h: descriptor: ()V
-    // .  .  
-       00 07 
-    // parsed:, offset 312, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 314, len 0, h:  attributes[0]: 
-        // parsed:, offset 314, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 316, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 320, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 322, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 324, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 10 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 333, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 335, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 337, len 0, h: end attributes[0] 
-// parsed:, offset 337, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 337, len:44,desc: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-// parsed:, offset 337, len 0, h:  methods[1]: 
-    // parsed:, offset 337, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 339, len 2, h: name: run
-    // .  .  
-       00 0e 
-    // parsed:, offset 341, len 2, h: descriptor: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    // .  .  
-       00 13 
-    // parsed:, offset 343, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 345, len 0, h:  attributes[0]: 
-        // parsed:, offset 345, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 347, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 351, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 353, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 355, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 1, h: 0001: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 2, len 5, h: 0002: invokeinterface ifaceMethod{dxc.junit.opcodes.invokeinterface.jm.ITest.doit:(I)V}, 0002
-        // .  .  .  .  .  
-//@mod           b9 00 02 02 00 
-           b9 00 02 02 01 
-        // parsed:, offset 7, len 1, h: 0007: return
-        // .  
-           b1 
-        // parsed:, offset 367, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 369, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 371, len 0, h: end attributes[0] 
-// parsed:, offset 371, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-// parsed:, offset 371, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 373, len 0, h:  attributes[0]: 
-    // parsed:, offset 373, len 2, h: name: SourceFile
-    // .  .  
-       00 0c 
-    // parsed:, offset 375, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 379, len 2, h: source: utf8{"T_invokeinterface_6.java"}
-    // .  .  
-       00 11 
-// parsed:, offset 381, len 0, h: end attributes[0] 
-// parsed:, offset 381, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6.j
deleted file mode 100644
index 8fff18f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_6.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 2
-    .limit locals 2
-
-    aload_1
-    iconst_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit(I)V 2
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_6.java
deleted file mode 100644
index b2a7846..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_6 {
-
-    public void run(ITest test) {
-        test.doit(1);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_7.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_7.j
deleted file mode 100644
index 3001e7d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_7.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 1
-    .limit locals 2
-
-    aload_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit1()V 1
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_7.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_7.java
deleted file mode 100644
index 2a04c77..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_7 {
-
-    public void run(ITest test) {
-        test.doit();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8.cfh b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8.cfh
deleted file mode 100644
index 7305c39..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8.cfh
+++ /dev/null
@@ -1,206 +0,0 @@
-//@class:dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0014
-// .  .  
-   00 14 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 19, h: 0001: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 29, len 27, h: 0002: utf8{"T_invokeinterface_8.java"}
-    // .  .  .  T  _  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  _  8  .  j  a  v  a  
-       01 00 18 54 5f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 5f 38 2e 6a 61 76 61 
-    // parsed:, offset 56, len 5, h: 0003: ifaceMethod{dxc.junit.opcodes.invokeinterface.jm.ITest.doit:(I)V}
-    // .  .  .  .  .  
-       0b 00 07 00 0b 
-    // parsed:, offset 61, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 70, len 3, h: 0005: type{java.lang.Object}
-    // .  .  .  
-       07 00 01 
-    // parsed:, offset 73, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 08 
-    // parsed:, offset 78, len 3, h: 0007: type{dxc.junit.opcodes.invokeinterface.jm.ITest}
-    // .  .  .  
-       07 00 0c 
-    // parsed:, offset 81, len 6, h: 0008: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 87, len 59, h: 0009: utf8{"dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8"}
-    // .  .  8  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  T  _  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  _  8  
-       01 00 38 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 54 5f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 5f 38 
-    // parsed:, offset 146, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 153, len 5, h: 000b: nat{doit:(I)V}
-    // .  .  .  .  .  
-       0c 00 10 00 0e 
-    // parsed:, offset 158, len 45, h: 000c: utf8{"dxc/junit/opcodes/invokeinterface/jm/ITest"}
-    // .  .  *  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  I  T  e  s  t  
-       01 00 2a 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 49 54 65 73 74 
-    // parsed:, offset 203, len 13, h: 000d: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 216, len 7, h: 000e: utf8{"(I)V"}
-    // .  .  .  (  I  )  V  
-       01 00 04 28 49 29 56 
-    // parsed:, offset 223, len 6, h: 000f: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 229, len 7, h: 0010: utf8{"doit"}
-    // .  .  .  d  o  i  t  
-       01 00 04 64 6f 69 74 
-    // parsed:, offset 236, len 5, h: 0011: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 05 00 06 
-    // parsed:, offset 241, len 3, h: 0012: type{dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_8}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 244, len 50, h: 0013: utf8{"(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V"}
-    // .  .  /  (  L  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  i  n  t  e  r  f  a  c  e  /  j  m  /  I  T  e  s  t  ;  )  V  
-       01 00 2f 28 4c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 69 6e 74 65 72 66 61 63 65 2f 6a 6d 2f 49 54 65 73 74 3b 29 56 
-// parsed:, offset 294, len 0, h: end constant_pool
-// parsed:, offset 294, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 296, len 2, h: this_class: type{dxc.junit.opcodes.invokeinterface.jm.T_invokeinterface_8}
-// .  .  
-   00 12 
-// parsed:, offset 298, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 05 
-// parsed:, offset 300, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 302, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 304, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 306, len:75,desc: ()V
-// parsed:, offset 306, len 0, h:  methods[0]: 
-    // parsed:, offset 306, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 308, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 310, len 2, h: descriptor: ()V
-    // .  .  
-       00 08 
-    // parsed:, offset 312, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 314, len 0, h:  attributes[0]: 
-        // parsed:, offset 314, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 316, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 320, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 322, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 324, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 11 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 333, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 335, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 337, len 0, h: end attributes[0] 
-// parsed:, offset 337, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 337, len:44,desc: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-// parsed:, offset 337, len 0, h:  methods[1]: 
-    // parsed:, offset 337, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 339, len 2, h: name: run
-    // .  .  
-       00 0f 
-    // parsed:, offset 341, len 2, h: descriptor: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    // .  .  
-       00 13 
-    // parsed:, offset 343, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 345, len 0, h:  attributes[0]: 
-        // parsed:, offset 345, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 347, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 351, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 353, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 355, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 1, h: 0001: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 2, len 5, h: 0002: invokeinterface ifaceMethod{dxc.junit.opcodes.invokeinterface.jm.ITest.doit:(I)V}, 0002
-        // .  .  .  .  .  
-//@mod           b9 00 03 02 00 
-           b9 00 03 01 00 
-        // parsed:, offset 7, len 1, h: 0007: return
-        // .  
-           b1 
-        // parsed:, offset 367, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 369, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 371, len 0, h: end attributes[0] 
-// parsed:, offset 371, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-// parsed:, offset 371, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 373, len 0, h:  attributes[0]: 
-    // parsed:, offset 373, len 2, h: name: SourceFile
-    // .  .  
-       00 0d 
-    // parsed:, offset 375, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 379, len 2, h: source: utf8{"T_invokeinterface_8.java"}
-    // .  .  
-       00 02 
-// parsed:, offset 381, len 0, h: end attributes[0] 
-// parsed:, offset 381, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8.j
deleted file mode 100644
index f96c46b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_8.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 2
-    .limit locals 2
-
-    aload_1
-    iconst_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit(I)V 2
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_8.java
deleted file mode 100644
index f64dd1f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_8 {
-
-    public void run(ITest test) {
-        test.doit(1);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_9.j b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_9.j
deleted file mode 100644
index a324d42..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokeinterface_9.java
-.class public dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(Ldxc/junit/opcodes/invokeinterface/jm/ITest;)V
-    .limit stack 2
-    .limit locals 2
-
-    aload_1
-;    iconst_1
-    invokeinterface dxc/junit/opcodes/invokeinterface/jm/ITest/doit(I)V 2
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_9.java b/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_9.java
deleted file mode 100644
index 8438b83..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokeinterface/jm/T_invokeinterface_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 dxc.junit.opcodes.invokeinterface.jm;
-
-public class T_invokeinterface_9 {
-
-    public void run(ITest test) {
-        test.doit(1);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/Test_invokespecial.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/Test_invokespecial.java
deleted file mode 100644
index 3413c3d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/Test_invokespecial.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokespecial;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_1;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_11;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_12;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_13;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_15;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_16;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_17;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_18;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_19;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_2;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_21;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_22;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_7;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_8;
-import dxc.junit.opcodes.invokespecial.jm.T_invokespecial_9;
-
-public class Test_invokespecial extends DxTestCase {
-    /**
-     * @title  Superclass' method call
-     */
-    public void testN1() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        T_invokespecial_1 t = new T_invokespecial_1();
-        assertEquals(5, t.run());
-    }
-
-    /**
-     * @title  private method call
-     */
-    public void testN2() {
-        T_invokespecial_2 t = new T_invokespecial_2();
-        assertEquals(345, t.run());
-    }
-
-    /**
-     * @title  Invoke method of superclass of superclass
-     */
-    public void testN3() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper2
-        T_invokespecial_15 t = new T_invokespecial_15();
-        assertEquals(5, t.run());
-    }
-
-    /**
-     * @title  Invoke protected method of superclass specifying "this"
-     * class
-     */
-    public void testN4() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        try {
-            T_invokespecial_17 t = new T_invokespecial_17();
-            assertEquals(5, t.run());
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Invoke protected method of superclass if method with the
-     * same name exists in "this" class
-     */
-    public void testN5() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        T_invokespecial_18 t = new T_invokespecial_18();
-        assertEquals(5, t.run());
-    }
-
-    /**
-     * @title  Check that method's arguments are popped from stack
-     */
-    public void testN6() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        T_invokespecial_19 t = new T_invokespecial_19();
-        assertEquals(2, t.run());
-    }
-
-    /**
-     * @title  Check that new frame is created by invokespecial
-     */
-    public void testN7() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        T_invokespecial_21 t = new T_invokespecial_21();
-        assertEquals(1, t.run());
-    }
-
-    /**
-     * @title  Check that monitor is acquired if method is synchronized
-     */
-    public void testN8() {
-        assertTrue(T_invokespecial_22.execute());
-    }
-
-
-
-    /**
-     * @title  method doesn't exist in "this" and superclass
-     */
-    public void testE1() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        try {
-            T_invokespecial_7 t = new T_invokespecial_7();
-            assertEquals(5, t.run());
-            fail("expected NoSuchMethodError");
-        } catch (NoSuchMethodError e) {
-            // expected
-        } catch (VerifyError vfe) {
-            // ok for dalvikvm; early resolution
-            System.out.print("dvmvfe:");
-        }
-    }
-
-    /**
-     * @title  method has different signature
-     */
-    public void testE2() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        try {
-            T_invokespecial_16 t = new T_invokespecial_16();
-            assertEquals(5, t.run());
-            fail("expected NoSuchMethodError");
-        } catch (NoSuchMethodError e) {
-            // expected
-        } catch (VerifyError vfe) {
-            // ok for dalvikvm; early resolution
-            System.out.print("dvmvfe:");
-        }
-    }
-
-    /**
-     * @title expected NullPointerException
-     */
-    public void testE3() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        T_invokespecial_8 t = new T_invokespecial_8();
-        try {
-            assertEquals(5, t.run());
-            fail("expected NullPointerException");
-        } catch (NullPointerException e) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Attempt to invoke static method
-     */
-    public void testE4() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        try {
-            T_invokespecial_11 t = new T_invokespecial_11();
-            assertEquals(5, t.run());
-            fail("expected IncompatibleClassChangeError");
-        } catch (IncompatibleClassChangeError e) {
-            // expected
-        } catch (VerifyError vfe) {
-            // ok for dalvikvm;
-            System.out.print("dvmvfe:");
-        }
-    }
-
-    /**
-     * @title  Native method can't be linked
-     */
-    public void testE5() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        T_invokespecial_9 t = new T_invokespecial_9();
-        try {
-            assertEquals(5, t.run());
-            fail("expected UnsatisfiedLinkError");
-        } catch (UnsatisfiedLinkError e) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Attempt to invoke private method of superclass
-     */
-    public void testE6() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        try {
-            T_invokespecial_12 t = new T_invokespecial_12();
-            assertEquals(5, t.run());
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError e) {
-            // expected
-        } catch (VerifyError vfe) {
-            // ok for dalvikvm;
-            System.out.print("dvmvfe:");
-        }
-    }
-
-    /**
-     * @title  Attempt to invoke abstract method
-     */
-    public void testE7() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TAbstract
-        T_invokespecial_13 t = new T_invokespecial_13();
-        try {
-            assertEquals(5, t.run());
-            fail("expected AbstractMethodError");
-        } catch (AbstractMethodError e) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.13 
-     * @title valid index into constant pool table
-     */
-    public void testVFE1() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.13 
-     * @title invalid index into constant pool table
-     */
-    public void testVFE2() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_23");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.14 
-     * @title only &lt;init&gt; may be called
-     */
-    public void testVFE3() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.7 
-     * @title invokespecial target must be in self or superclass
-     */
-    public void testVFE4() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TPlain
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1 
-     * @title number of arguments
-     */
-    public void testVFE5() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1 
-     * @title type of argument - int
-     */
-    public void testVFE6() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.7 
-     * @title invokespecial must name method of "this" class or
-     *                 superclass
-     */
-    public void testVFE7() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_20");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.7 
-     * @title number of arguments passed to method
-     */
-    public void testVFE8() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_14");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.12 
-     * @title types of arguments passed to method
-     */
-    public void testVFE9() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_24");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.13 
-     * @title assignment incompatible references when accessing
-     *                  protected method
-     */
-    public void testVFE10() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        //@uses dxc.junit.opcodes.invokespecial.jm.TPlain
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_25");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.13 
-     * @title assignment incompatible references when accessing
-     *                  public method
-     */
-    public void testVFE11() {
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper
-        //@uses dxc.junit.opcodes.invokespecial.jm.TSuper2
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokespecial.jm.T_invokespecial_26");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/TAbstract.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/TAbstract.java
deleted file mode 100644
index b37a275..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/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 dxc.junit.opcodes.invokespecial.jm;
-
-public abstract class TAbstract {
-    public abstract int toInt();
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/TPlain.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/TPlain.java
deleted file mode 100644
index 166c91a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/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 dxc.junit.opcodes.invokespecial.jm;
-
-public class TPlain {
-    public int toInt() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/TSuper.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/TSuper.java
deleted file mode 100644
index 3abf06f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/TSuper.java
+++ /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.
- */
-
-/** Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dxc.junit.opcodes.invokespecial.jm;
-
-/**
- * @author fjost
- *
- */
-public class TSuper {
-    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/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/TSuper2.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/TSuper2.java
deleted file mode 100644
index 049cedd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/TSuper2.java
+++ /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.
- */
-
-/** Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dxc.junit.opcodes.invokespecial.jm;
-
-/**
- * @author fjost
- *
- */
-public class TSuper2 extends TSuper {
-    
-    public int test() {
-        return 13;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_1.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_1.j
deleted file mode 100644
index b2bbe6f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_1.j
+++ /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_invokespecial_1.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_1
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toInt()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_1.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_1.java
deleted file mode 100644
index 865d81f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_1 extends TSuper {
-
-    public int run() {
-        return super.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_10.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_10.j
deleted file mode 100644
index ece1dfc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_10.j
+++ /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_invokespecial_10.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_10
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-;    aload_0
-    iconst_1
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toInt()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_10.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_10.java
deleted file mode 100644
index 82226b1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_10 extends TSuper {
-
-    public int run() {
-        return super.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_11.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_11.j
deleted file mode 100644
index 7be1c31..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_11.j
+++ /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_invokespecial_11.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_11
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toIntStatic()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_11.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_11.java
deleted file mode 100644
index da69e2f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_11 extends TSuper {
-
-    public int run() {
-        return super.toIntStatic();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_12.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_12.j
deleted file mode 100644
index 3396e82..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_12.j
+++ /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_invokespecial_12.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_12
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toIntPvt()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_12.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_12.java
deleted file mode 100644
index 3ad0f09..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_12 extends TSuper {
-
-    public int run() {
-        return super.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_13.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_13.j
deleted file mode 100644
index 1e639e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_13.j
+++ /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_invokespecial_13.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_13
-.super dxc/junit/opcodes/invokespecial/jm/TAbstract
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TAbstract/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TAbstract/toInt()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_13.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_13.java
deleted file mode 100644
index 9c43cdc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_13 extends TAbstract {
-    
-    public int toInt() {
-        return 5;
-    }
-
-    public int run() {
-        return toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_14.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_14.j
deleted file mode 100644
index 983792e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_14.j
+++ /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 T_invokespecial_14.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_14
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-    aload_0
-;    ldc 5.0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toInt(F)I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_14.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_14.java
deleted file mode 100644
index 619f75f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_14.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_14 extends TSuper {
-
-    public int run() {
-        return super.toInt(5f);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_15.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_15.j
deleted file mode 100644
index 51650d9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_15.j
+++ /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_invokespecial_15.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_15
-.super dxc/junit/opcodes/invokespecial/jm/TSuper2
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper2/<init>()V
-    return
-.end method
-
-.method public run()I
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper2/toInt()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_15.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_15.java
deleted file mode 100644
index cabb444..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_15.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_15 extends TSuper2 {
-
-    public int run() {
-        return super.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_16.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_16.j
deleted file mode 100644
index 76c397c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_16.j
+++ /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 T_invokespecial_16.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_16
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toInt()F
-    pop
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_16.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_16.java
deleted file mode 100644
index 7cdb15a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_16 extends TSuper {
-
-    public int run() {
-        return super.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_17.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_17.j
deleted file mode 100644
index 6a02a3c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_17.j
+++ /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 T_invokespecial_17.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_17
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/T_invokespecial_17/toIntP()I
-    ireturn
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_17.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_17.java
deleted file mode 100644
index 6c9a6da..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_17 extends TSuper {
-
-    public int run() {
-        return super.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_18.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_18.j
deleted file mode 100644
index c12833b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_18.j
+++ /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_invokespecial_18.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_18
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toIntP()I
-    ireturn
-    
-.end method
-
-.method protected toIntP()I
-
-    sipush 10
-    ireturn
-   
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_18.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_18.java
deleted file mode 100644
index 7821f26..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_18.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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_18 extends TSuper {
-
-    protected int toIntP() {
-        return 10;
-    }
-    
-    public int run() {
-        return super.toIntP();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_19.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_19.j
deleted file mode 100644
index bcbee9b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_19.j
+++ /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_invokespecial_19.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_19
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 4
-    .limit locals 2
-    iconst_1
-    aload_0
-    sipush 128
-    sipush 64
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/testArgsOrder(II)I
-    istore_1
-    iconst_1
-    if_icmpeq Label1
-    iinc 1 1
-Label1:
-    iload_1    
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_19.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_19.java
deleted file mode 100644
index c828ff1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_19 extends TSuper {
-
-    public int run() {
-        return super.testArgsOrder(128, 64);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_2.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_2.j
deleted file mode 100644
index 4dbda7f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokespecial_2.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/T_invokespecial_2/getInt()I
-    ireturn
-.end method
-
-.method private getInt()I
-    sipush 345
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_2.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_2.java
deleted file mode 100644
index d7e604e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_2 {
-
-    public int run() {
-        return getInt();
-    }
-
-    private int getInt() {
-        return 345;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_20.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_20.j
deleted file mode 100644
index b7e0b34..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_20.j
+++ /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_invokespecial_20.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_20
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    aload_0
-    invokespecial toInt()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_20.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_20.java
deleted file mode 100644
index 48df5d2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_20.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_20 extends TSuper {
-
-    public int run() {
-        return toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_21.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_21.j
deleted file mode 100644
index 961b329..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_21.j
+++ /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_invokespecial_21.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_21
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit locals 3
-    .limit stack 5
-    
-    sipush 123
-    istore_1
-    sipush 456
-    istore_2
-    
-    aload_0
-    iconst_1
-    iconst_2
-    invokespecial dxc/junit/opcodes/invokespecial/jm/T_invokespecial_21/test(II)I
-    
-    sipush 5
-    if_icmpne Label0
-    
-    iload_1
-    sipush 123
-    if_icmpne Label0
-
-    iload_2
-    sipush 456
-    if_icmpne Label0    
-    
-    iconst_1
-    ireturn
-    
-Label0:    
-    iconst_0
-    ireturn
-.end method
-
-.method private test(II)I
-    .limit locals 3
-    sipush 987
-    istore_1
-    sipush 765
-    istore_2
-    
-    sipush 5
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_21.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_21.java
deleted file mode 100644
index 2e3ab91..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_21.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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_21 extends TSuper {
-
-    
-    private int test(int a, int b) {
-        int i = 0;
-        int j = 0;
-        return 5;
-    }
-    
-    public int run() {
-        int i = 123;
-        int j = 456;
-        test(0, 1);
-        
-        return 1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_22.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_22.j
deleted file mode 100644
index e2bdcbb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_22.j
+++ /dev/null
@@ -1,159 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokespecial_22.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_22
-.super java/lang/Object
-.implements java/lang/Runnable
-
-.field  value I
-.field  failed Z
-
-.method public <init>()V
-    .limit stack 3
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.invokespecial.jm.T_invokespecial_22.value I
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.invokespecial.jm.T_invokespecial_22.failed Z
-
-    return
-
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-   
-    iconst_0
-    istore_1
-
-Label4:
-    iload_1
-    sipush 1000
-    if_icmpge Label3
-
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/T_invokespecial_22/test()V
-
-    iinc 1 1
-
-    goto Label4
-
-
-Label3:
-    return
-
-.end method
-
-
-
-.method private synchronized test()V
-    .limit stack 3
-    .limit locals 2
-    
-.line 16
-    aload_0
-    dup
-    getfield dxc.junit.opcodes.invokespecial.jm.T_invokespecial_22.value I
-    dup
-    istore_1
-
-    iconst_1
-    iadd
-    putfield dxc.junit.opcodes.invokespecial.jm.T_invokespecial_22.value I
-
-    iinc 1 1
-
-    invokestatic java/lang/Thread/yield()V
-
-    iload_1
-    aload_0
-    getfield dxc.junit.opcodes.invokespecial.jm.T_invokespecial_22.value I
-    if_icmpeq Label0
-
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.invokespecial.jm.T_invokespecial_22.failed Z
-
-Label0:
-    return
-.end method
-
-
-
-.method public static execute()Z
-    .limit stack 3
-    .limit locals 4
-
-    new dxc/junit/opcodes/invokespecial/jm/T_invokespecial_22
-    dup
-    invokespecial dxc/junit/opcodes/invokespecial/jm/T_invokespecial_22/<init>()V
-    astore_0
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_1
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_2
-
-    aload_1
-    invokevirtual java/lang/Thread/start()V
-
-    aload_2
-    invokevirtual java/lang/Thread/start()V
-
-Label12:
-    ldc2_w 5000
-    invokestatic java/lang/Thread/sleep(J)V
-
-Label13:
-    goto Label0
-
-Label14:            ; exception handler
-    astore_3
-    goto Label3
-
-Label0:
-    aload_0
-    getfield dxc.junit.opcodes.invokespecial.jm.T_invokespecial_22.value I
-    sipush 2000
-    if_icmpne Label3
-
-    aload_0
-    getfield dxc.junit.opcodes.invokespecial.jm.T_invokespecial_22.failed Z
-    ifne Label3
-
-    iconst_1
-    ireturn
-
-Label3:
-    iconst_0
-    ireturn
-
-.catch java/lang/InterruptedException from Label12 to Label13 using Label14
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_22.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_22.java
deleted file mode 100644
index b9cb14f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_22.java
+++ /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.
- */
-
-package dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_22 implements Runnable {
-    public final static int CNT = 1000;
-    int value = 0;
-    boolean failed = false;
-    
-    public void run() {
-        for(int i = 0; i < CNT; i++) {
-            test();
-        }
-    }
-    
-    private synchronized void test()    {
-        value++;
-        int c = value;
-        Thread.yield();
-        if(c != value)
-            failed = true;
-    }
-    
-    public static boolean execute() {
-        T_invokespecial_22 test = new T_invokespecial_22();
-        Thread t1 = new Thread(test);
-        Thread t2 = new Thread(test);
-        
-        t1.start();
-        t2.start();
-        
-        try
-        {
-            Thread.sleep(5000);
-        }
-        catch(InterruptedException ie) {
-            return false;
-        }
-        
-        if(test.value != CNT * 2)
-            return false;
-        return !test.failed;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23.cfh b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23.cfh
deleted file mode 100644
index feb9dcb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23.cfh
+++ /dev/null
@@ -1,131 +0,0 @@
-//@class:dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000c
-// .  .  
-   00 0c 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0b 00 05 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 5, h: 0005: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 09 
-    // parsed:, offset 61, len 56, h: 0006: utf8{"dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23"}
-    // .  .  5  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  s  p  e  c  i  a  l  /  j  m  /  T  _  i  n  v  o  k  e  s  p  e  c  i  a  l  _  2  3  
-       01 00 35 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 73 70 65 63 69 61 6c 2f 6a 6d 2f 54 5f 69 6e 76 6f 6b 65 73 70 65 63 69 61 6c 5f 32 33 
-    // parsed:, offset 117, len 7, h: 0007: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 124, len 26, h: 0008: utf8{"T_invokespecial_23.java"}
-    // .  .  .  T  _  i  n  v  o  k  e  s  p  e  c  i  a  l  _  2  3  .  j  a  v  a  
-       01 00 17 54 5f 69 6e 76 6f 6b 65 73 70 65 63 69 61 6c 5f 32 33 2e 6a 61 76 61 
-    // parsed:, offset 150, len 6, h: 0009: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 156, len 3, h: 000a: type{dxc.junit.opcodes.invokespecial.jm.T_invokespecial_23}
-    // .  .  .  
-       07 00 06 
-    // parsed:, offset 159, len 3, h: 000b: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.invokespecial.jm.T_invokespecial_23}
-// .  .  
-   00 0a 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0b 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:<init>, offset 174, len:41,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 09 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-//@mod           b7 00 01 
-           b7 01 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// parsed:, offset 205, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 207, len 0, h:  attributes[0]: 
-    // parsed:, offset 207, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 209, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 213, len 2, h: source: utf8{"T_invokespecial_23.java"}
-    // .  .  
-       00 08 
-// parsed:, offset 215, len 0, h: end attributes[0] 
-// parsed:, offset 215, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23.j
deleted file mode 100644
index 4e92d44..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23.j
+++ /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.
-
-.source T_invokespecial_23.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23.java
deleted file mode 100644
index c4b048e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_23.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_23 {
-
-    public T_invokespecial_23() {
-        // only constructor        
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_24.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_24.j
deleted file mode 100644
index 487c7c6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_24.j
+++ /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 T_invokespecial_24.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_24
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 3
-    aload_0
-    dconst_1
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toInt(F)I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_24.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_24.java
deleted file mode 100644
index ef62353..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_24.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_24 extends TSuper {
-
-    public int run() {
-        return super.toInt(5f);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_25.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_25.j
deleted file mode 100644
index 764c322..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_25.j
+++ /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_invokespecial_25.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_25
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 2
-    .limit locals 2
-
-    new dxc/junit/opcodes/invokespecial/jm/TPlain
-    dup
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TPlain/<init>()V
-    astore_1
-
-    aload_1
-    invokevirtual dxc/junit/opcodes/invokespecial/jm/TSuper/toIntP()I
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_25.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_25.java
deleted file mode 100644
index 9f2a005..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_25.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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_25 extends TSuper {
-
-    public int run() {
-        TPlain p = new TPlain();
-        return p.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_26.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_26.j
deleted file mode 100644
index ba28332..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_26.j
+++ /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_invokespecial_26.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_26
-.super dxc/junit/opcodes/invokespecial/jm/TSuper2
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper2/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-    .limit locals 1
-    
-    new dxc/junit/opcodes/invokespecial/jm/TSuper
-    dup
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper2/test()I
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_26.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_26.java
deleted file mode 100644
index ffd72f3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_26.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_26 extends TSuper2 {
-    
-    public int run() {
-        return super.test();
-    }   
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3.cfh b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3.cfh
deleted file mode 100644
index 89ebfae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3.cfh
+++ /dev/null
@@ -1,132 +0,0 @@
-//@class:dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000c
-// .  .  
-   00 0c 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0b 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 55, h: 0003: utf8{"dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3"}
-    // .  .  4  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  s  p  e  c  i  a  l  /  j  m  /  T  _  i  n  v  o  k  e  s  p  e  c  i  a  l  _  3  
-       01 00 34 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 73 70 65 63 69 61 6c 2f 6a 6d 2f 54 5f 69 6e 76 6f 6b 65 73 70 65 63 69 61 6c 5f 33 
-    // parsed:, offset 89, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 102, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 111, len 25, h: 0006: utf8{"T_invokespecial_3.java"}
-    // .  .  .  T  _  i  n  v  o  k  e  s  p  e  c  i  a  l  _  3  .  j  a  v  a  
-       01 00 16 54 5f 69 6e 76 6f 6b 65 73 70 65 63 69 61 6c 5f 33 2e 6a 61 76 61 
-    // parsed:, offset 136, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0a 
-    // parsed:, offset 141, len 3, h: 0008: type{dxc.junit.opcodes.invokespecial.jm.T_invokespecial_3}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 144, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 151, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 157, len 3, h: 000b: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 160, len 0, h: end constant_pool
-// parsed:, offset 160, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 162, len 2, h: this_class: type{dxc.junit.opcodes.invokespecial.jm.T_invokespecial_3}
-// .  .  
-   00 08 
-// parsed:, offset 164, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0b 
-// parsed:, offset 166, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 168, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: methods_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:<init>, offset 172, len:41,desc: ()V
-// parsed:, offset 172, len 0, h:  methods[0]: 
-    // parsed:, offset 172, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 174, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 176, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 178, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 180, len 0, h:  attributes[0]: 
-        // parsed:, offset 180, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 182, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 186, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 188, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-    //@mod:b7 00 01 
-           b7 00 02 
-           
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 199, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 201, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 203, len 0, h: end attributes[0] 
-// parsed:, offset 203, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// parsed:, offset 203, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 205, len 0, h:  attributes[0]: 
-    // parsed:, offset 205, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 207, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 211, len 2, h: source: utf8{"T_invokespecial_3.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 213, len 0, h: end attributes[0] 
-// parsed:, offset 213, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3.j
deleted file mode 100644
index f62d537..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3.j
+++ /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.
-
-.source T_invokespecial_3.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_3.java
deleted file mode 100644
index bd1a34e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_3 {
-
-    public T_invokespecial_3() {
-        // only constructor        
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_4.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_4.j
deleted file mode 100644
index 072e67d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_4.j
+++ /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.
-
-.source T_invokespecial_4.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<clinit>()V
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_4.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_4.java
deleted file mode 100644
index 04b907f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_4 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_5.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_5.j
deleted file mode 100644
index 1a6a6a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_5.j
+++ /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_invokespecial_5.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_5
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-;    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toInt()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_5.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_5.java
deleted file mode 100644
index 40b961e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_5 extends TSuper {
-
-    public int run() {
-        return super.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_6.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_6.j
deleted file mode 100644
index 14db5c5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_6.j
+++ /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.
-
-.source T_invokespecial_6.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TPlain/doit()V
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_6.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_6.java
deleted file mode 100644
index eed67c7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_6.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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_6 {
-
-    public void run() {
-        pri();
-        pro();
-    }
-
-    protected void pro() {
-        // TODO Auto-generated method stub
-        
-    }
-
-    private void pri() {
-        // TODO Auto-generated method stub
-        
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_7.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_7.j
deleted file mode 100644
index c1d5d80..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_7.j
+++ /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_invokespecial_7.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_7
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/T_invokespecial_7/toInt1()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_7.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_7.java
deleted file mode 100644
index b62ed8f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_7 extends TSuper {
-
-    public int run() {
-        return super.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_8.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_8.j
deleted file mode 100644
index e832660..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_8.j
+++ /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_invokespecial_8.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_8
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-;    aload_0
-    aconst_null
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toInt()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_8.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_8.java
deleted file mode 100644
index e11e638..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_8 extends TSuper {
-
-    public int run() {
-        return super.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_9.j b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_9.j
deleted file mode 100644
index 244fb4b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_9.j
+++ /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_invokespecial_9.java
-.class public dxc/junit/opcodes/invokespecial/jm/T_invokespecial_9
-.super dxc/junit/opcodes/invokespecial/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    aload_0
-    invokespecial dxc/junit/opcodes/invokespecial/jm/TSuper/toIntNative()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_9.java b/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_9.java
deleted file mode 100644
index 4a0b27a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokespecial/jm/T_invokespecial_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 dxc.junit.opcodes.invokespecial.jm;
-
-public class T_invokespecial_9 extends TSuper {
-
-    public int run() {
-        return super.toInt();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/TestStubs.java
deleted file mode 100644
index 9d5cfea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/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 dxc.junit.opcodes.invokestatic;
-
-public class TestStubs {
-
-    protected void TestStub() {
-        // used by testE9
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/Test_invokestatic.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/Test_invokestatic.java
deleted file mode 100644
index e506a30..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/Test_invokestatic.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokestatic;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_1;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_12;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_13;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_14;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_15;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_16;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_17;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_18;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_2;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_4;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_5;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_6;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_7;
-import dxc.junit.opcodes.invokestatic.jm.T_invokestatic_8;
-
-public class Test_invokestatic extends DxTestCase {
-
-    /**
-     * @title  Static method from library class Math
-     */
-    public void testN1() {
-        T_invokestatic_1 t = new T_invokestatic_1();
-        assertEquals(1234567, t.run());
-    }
-
-    /**
-     * @title  Static method from user class
-     */
-    public void testN2() {
-        // @uses dxc.junit.opcodes.invokestatic.jm.TestClass
-        T_invokestatic_2 t = new T_invokestatic_2();
-        assertEquals(777, t.run());
-    }
-
-    /**
-     * @title  Check that <clinit> is called
-     */
-    public void testN3() {
-        assertEquals(123456789l, T_invokestatic_4.run());
-    }
-
-    /**
-     * @title  Check that monitor is acquired if method is synchronized
-     */
-    public void testN4() {
-        assertTrue(T_invokestatic_12.execute());
-    }
-
-    /**
-     * @title  Check that new frame is created by invokestatic and
-     * arguments are passed to method
-     */
-    public void testN5() {
-        // @uses dxc.junit.opcodes.invokestatic.jm.TestClass
-        T_invokestatic_15 t = new T_invokestatic_15();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  Static protected method from other class in the same package
-     */
-    public void testN6() {
-        // @uses dxc.junit.opcodes.invokestatic.jm.TestClass
-        T_invokestatic_18 t = new T_invokestatic_18();
-        assertEquals(888, t.run());
-    }
-
-    /**
-     * @title  attempt to call non-static method
-     * 
-     */
-    public void testE1() {
-        try {
-            T_invokestatic_5 t = new T_invokestatic_5();
-            t.run();
-            fail("expected IncompatibleClassChangeError");
-        } catch (IncompatibleClassChangeError icce) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Native method can't be linked
-     * 
-     */
-    public void testE2() {
-        T_invokestatic_6 t = new T_invokestatic_6();
-        try {
-            t.run();
-            fail("expected UnsatisfiedLinkError");
-        } catch (UnsatisfiedLinkError ule) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  NoSuchMethodError
-     */
-    public void testE3() {
-        try {
-            T_invokestatic_7 t = new T_invokestatic_7();
-            t.run();
-            fail("expected NoSuchMethodError");
-        } catch (NoSuchMethodError nsme) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Attempt to call private method of other class
-     * 
-     */
-    public void testE5() {
-        // @uses dxc.junit.opcodes.invokestatic.jm.TestClass
-        try {
-            T_invokestatic_8 t = new T_invokestatic_8();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  method has different signature
-     */
-    public void testE6() {
-        // @uses dxc.junit.opcodes.invokestatic.jm.TestClass
-        try {
-               T_invokestatic_13 t = new T_invokestatic_13();
-            t.run();
-            fail("expected NoSuchMethodError");
-        } catch (NoSuchMethodError nsme) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  initialization of referenced class throws exception
-     */
-    public void testE7() {
-        // @uses dxc.junit.opcodes.invokestatic.jm.TestClassInitError
-        T_invokestatic_14 t = new T_invokestatic_14();
-        try {
-            t.run();
-            fail("expected Error");
-        } catch (Error e) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Attempt to call abstract method of other class
-     * 
-     */
-    public void testE8() {
-        // @uses dxc.junit.opcodes.invokestatic.jm.TestClassAbstract
-        try {
-            T_invokestatic_16 t = new T_invokestatic_16();
-            t.run();
-            fail("expected IncompatibleClassChangeError");
-        } catch (IncompatibleClassChangeError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Attempt to call protected method of unrelated class
-     * 
-     */
-    public void testE9() {
-        // @uses dxc.junit.opcodes.invokestatic.TestStubs
-        try {
-            T_invokestatic_17 t = new T_invokestatic_17();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.13
-     * @title invalid type into constant pool
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.invokestatic.jm.T_invokestatic_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.13
-     * @title invalid index into constant pool table
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.invokestatic.jm.T_invokestatic_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.14 
-     * @title &lt;clinit&gt; may not be called using invokestatic
-     */
-    public void testVFE3() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokestatic.jm.T_invokestatic_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1 
-     * @title number of arguments passed to method
-     */
-    public void testVFE4() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokestatic.jm.T_invokestatic_11");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.14 
-     * @title &lt;init&gt; may not be called using invokestatic
-     */
-    public void testVFE5() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokestatic.jm.T_invokestatic_19");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.12 
-     * @title types of arguments passed to method
-     */
-    public void testVFE6() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokestatic.jm.T_invokestatic_20");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_1.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_1.j
deleted file mode 100644
index 59b7ab8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_1.j
+++ /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_invokestatic_1.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    ldc -1234567
-    invokestatic java/lang/Math/abs(I)I
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_1.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_1.java
deleted file mode 100644
index c145a8e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_1 {
-
-    public int run() {
-        return Math.abs(-1234567);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_10.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_10.j
deleted file mode 100644
index 4a82b56..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_10.j
+++ /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_invokestatic_10.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_10
-.super java/lang/Object
-
-.field static v I
-
-.method static <clinit>()V
-    .limit stack 2
-    .limit locals 0
-
-    ldc 1
-    putstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_10.v I
-    return
-.end method
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    invokestatic dxc/junit/opcodes/invokestatic/jm/T_invokestatic_10/<clinit>()V
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_10.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_10.java
deleted file mode 100644
index aeabf23..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_10 {
-    
-    public int run() {
-        return Math.abs(-1234567);
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_11.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_11.j
deleted file mode 100644
index 49f3b5c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_11.j
+++ /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_invokestatic_11.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-;    ldc -1234567
-    invokestatic java/lang/Math/abs(I)I
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_11.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_11.java
deleted file mode 100644
index 89cf798..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_11 {
-    
-    public int run() {
-        return Math.abs(-1234567);
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_12.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_12.j
deleted file mode 100644
index 1b1ab55..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_12.j
+++ /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.
-
-.source T_invokestatic_12.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_12
-.super java/lang/Object
-.implements java/lang/Runnable
-
-.field static value I
-.field static failed Z
-
-.method static <clinit>()V
-    .limit stack 1
-    iconst_0
-    putstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_12.value I
-
-    iconst_0
-    putstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_12.failed Z
-
-    return
-.end method
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-
-    iconst_0
-    istore_1
-
-    Label1:
-    invokestatic dxc/junit/opcodes/invokestatic/jm/T_invokestatic_12/test()V
-
-    iinc 1 1
-
-    iload_1
-    sipush 1000
-    if_icmplt Label1
-
-    return
-
-.end method
-
-
-.method private static synchronized test()V
-    .limit stack 2
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_12.value I
-    iconst_1
-    iadd
-    putstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_12.value I
-
-    getstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_12.value I
-    istore_0
-
-    invokestatic java/lang/Thread/yield()V
-
-    iload_0
-    getstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_12.value I
-    if_icmpeq Label0
-
-    iconst_1
-    putstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_12.failed Z
-
-Label0:
-    return
-.end method
-
-.method public static execute()Z
-    .limit stack 3
-    .limit locals 4
-
-    new dxc/junit/opcodes/invokestatic/jm/T_invokestatic_12
-    dup
-    invokespecial dxc/junit/opcodes/invokestatic/jm/T_invokestatic_12/<init>()V
-    astore_0
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_1
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_2
-
-    aload_1
-    invokevirtual java/lang/Thread/start()V
-
-    aload_2
-    invokevirtual java/lang/Thread/start()V
-
-Label12:
-    ldc2_w 5000
-    invokestatic java/lang/Thread/sleep(J)V
-
-Label13:
-    goto Label0
-
-Label14:
-    astore_3
-    iconst_0
-    ireturn
-
-Label0:
-    getstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_12.value I
-    sipush 2000
-    if_icmpeq Label1
-
-    iconst_0
-    ireturn
-
-Label1:
-    getstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_12.failed Z
-    ifeq Label2
-    iconst_0
-    ireturn
-
-Label2:
-    iconst_1
-    ireturn
-
-.catch java/lang/InterruptedException from Label12 to Label13 using Label14
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_12.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_12.java
deleted file mode 100644
index 11fc236..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_12.java
+++ /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.
- */
-
-package dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_12 implements Runnable {
-    public final static int CNT = 1000;
-    static int value = 0;
-    static boolean failed = false;
-    
-    public void run() {
-        for(int i = 0; i < CNT; i++) {
-            test();
-        }
-    }
-    
-    private synchronized static void test()    {
-        value++;
-        int c = value;
-        Thread.yield();
-        if(c != value)
-            failed = true;
-    }
-    
-    public static boolean execute() {
-        T_invokestatic_12 test = new T_invokestatic_12();
-        Thread t1 = new Thread(test);
-        Thread t2 = new Thread(test);
-        
-        t1.start();
-        t2.start();
-        
-        try
-        {
-            Thread.sleep(5000);
-        }
-        catch(InterruptedException ie) {
-            return false;
-        }
-        
-        if(value != CNT * 2)
-            return false;
-        return !failed;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_13.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_13.j
deleted file mode 100644
index 9b008f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_13.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokestatic_13.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_13
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    fconst_1
-    invokestatic dxc/junit/opcodes/invokestatic/jm/TestClass/test1(F)I
-    pop
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_13.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_13.java
deleted file mode 100644
index e265d15..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_13 {
-    
-    public void run(){
-        TestClass.test1(1);
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_14.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_14.j
deleted file mode 100644
index ce3423c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_14.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokestatic_14.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_14
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/invokestatic/jm/TestClassInitError/test()V
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_14.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_14.java
deleted file mode 100644
index c003d15..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_14.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_14 {
-    
-    public void run(){
-        TestClassInitError.test();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_15.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_15.j
deleted file mode 100644
index dfbf896..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_15.j
+++ /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.
-
-.source T_invokestatic_15.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_15
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 3
-
-    bipush 123
-    istore_1
-
-    sipush 345
-    istore_2
-
-    sipush 12
-    sipush 6
-    
-    invokestatic dxc/junit/opcodes/invokestatic/jm/TestClass/testArgsOrder(II)I
-
-    iconst_2
-    if_icmpne Label0
-
-    iload_1
-    bipush 123
-    if_icmpne Label0
-
-    iload_2
-    sipush 345
-    if_icmpne Label0
-
-    iconst_1
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_15.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_15.java
deleted file mode 100644
index 26dfe06..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_15.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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_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/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_16.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_16.j
deleted file mode 100644
index 4b88c39..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_16.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokestatic_16.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_16
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/invokestatic/jm/TestClassAbstract/test()V
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_16.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_16.java
deleted file mode 100644
index e59ad78..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_16 {
-    
-    public void run(){
-       // TestClassAbstract.test();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_17.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_17.j
deleted file mode 100644
index ce62483..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_17.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokestatic_17.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_17
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/invokestatic/TestStubs/TestStub()V
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_17.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_17.java
deleted file mode 100644
index 995e4da..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_17 {
-    
-    public void run(){
-       // TestStubs.TestStub();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_18.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_18.j
deleted file mode 100644
index 1089e35..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_18.j
+++ /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 T_invokestatic_18.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_18
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/invokestatic/jm/TestClass/testP()I
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_18.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_18.java
deleted file mode 100644
index 7a168c6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_18.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 dxc.junit.opcodes.invokestatic.jm;
-
-import dxc.junit.opcodes.invokestatic.jm.TestClass;
-
-public class T_invokestatic_18  {
-    
-    public int run() {
-        return TestClass.testP();
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_19.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_19.j
deleted file mode 100644
index 70b7401..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_19.j
+++ /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_invokestatic_19.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_19
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokestatic java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    iconst_0
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_19.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_19.java
deleted file mode 100644
index 0c712c1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_19 {
-    
-    public int run() {
-        return Math.abs(-1234567);
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_2.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_2.j
deleted file mode 100644
index 7eb5362..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_2.j
+++ /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 T_invokestatic_2.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/invokestatic/jm/TestClass/test()I
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_2.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_2.java
deleted file mode 100644
index 3ca965e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-import dxc.junit.opcodes.invokestatic.jm.TestClass;
-
-public class T_invokestatic_2  {
-    
-    public int run() {
-        return TestClass.test();
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_20.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_20.j
deleted file mode 100644
index 638d7a84..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_20.j
+++ /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 T_invokestatic_20.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_20
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-;    ldc -1234567
-    ldc2_w 1
-    invokestatic java/lang/Math/abs(I)I
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_20.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_20.java
deleted file mode 100644
index 7aabdc0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_20.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_20 {
-    
-    public int run() {
-        return Math.abs(-1234567);
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3.cfh b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3.cfh
deleted file mode 100644
index d3cdaf8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3.cfh
+++ /dev/null
@@ -1,206 +0,0 @@
-//@class:dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0015
-// .  .  
-   00 15 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 19, h: 0001: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 29, len 9, h: 0002: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 38, len 3, h: 0003: type{java.lang.Object}
-    // .  .  .  
-       07 00 01 
-    // parsed:, offset 41, len 5, h: 0004: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 02 00 05 
-    // parsed:, offset 46, len 6, h: 0005: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 52, len 7, h: 0006: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 59, len 13, h: 0007: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 72, len 6, h: 0008: utf8{"()I"}
-    // .  .  .  (  )  I  
-       01 00 03 28 29 49 
-    // parsed:, offset 78, len 6, h: 0009: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 84, len 3, h: 000a: type{java.lang.Math}
-    // .  .  .  
-       07 00 11 
-    // parsed:, offset 87, len 6, h: 000b: utf8{"abs"}
-    // .  .  .  a  b  s  
-       01 00 03 61 62 73 
-    // parsed:, offset 93, len 5, h: 000c: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 03 00 04 
-    // parsed:, offset 98, len 5, h: 000d: method{java.lang.Math.abs:(I)I}
-    // .  .  .  .  .  
-       0a 00 0a 00 13 
-    // parsed:, offset 103, len 53, h: 000e: utf8{"dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3"}
-    // .  .  2  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  s  t  a  t  i  c  /  j  m  /  T  _  i  n  v  o  k  e  s  t  a  t  i  c  _  3  
-       01 00 32 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 73 74 61 74 69 63 2f 6a 6d 2f 54 5f 69 6e 76 6f 6b 65 73 74 61 74 69 63 5f 33 
-    // parsed:, offset 156, len 7, h: 000f: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-    // parsed:, offset 163, len 3, h: 0010: type{dxc.junit.opcodes.invokestatic.jm.T_invokestatic_3}
-    // .  .  .  
-       07 00 0e 
-    // parsed:, offset 166, len 17, h: 0011: utf8{"java/lang/Math"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  M  a  t  h  
-       01 00 0e 6a 61 76 61 2f 6c 61 6e 67 2f 4d 61 74 68 
-    // parsed:, offset 183, len 5, h: 0012: int{0xffed2979 / -1234567}
-    // .  .  .  )  y  
-       03 ff ed 29 79 
-    // parsed:, offset 188, len 5, h: 0013: nat{abs:(I)I}
-    // .  .  .  .  .  
-       0c 00 0b 00 0f 
-    // parsed:, offset 193, len 24, h: 0014: utf8{"T_invokestatic_3.java"}
-    // .  .  .  T  _  i  n  v  o  k  e  s  t  a  t  i  c  _  3  .  j  a  v  a  
-       01 00 15 54 5f 69 6e 76 6f 6b 65 73 74 61 74 69 63 5f 33 2e 6a 61 76 61 
-// parsed:, offset 217, len 0, h: end constant_pool
-// parsed:, offset 217, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 219, len 2, h: this_class: type{dxc.junit.opcodes.invokestatic.jm.T_invokestatic_3}
-// .  .  
-   00 10 
-// parsed:, offset 221, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 03 
-// parsed:, offset 223, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 225, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 227, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 229, len:73,desc: ()V
-// parsed:, offset 229, len 0, h:  methods[0]: 
-    // parsed:, offset 229, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 231, len 2, h: name: <init>
-    // .  .  
-       00 02 
-    // parsed:, offset 233, len 2, h: descriptor: ()V
-    // .  .  
-       00 05 
-    // parsed:, offset 235, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 237, len 0, h:  attributes[0]: 
-        // parsed:, offset 237, len 2, h: name: Code
-        // .  .  
-           00 06 
-        // parsed:, offset 239, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 243, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 245, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 247, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 0c 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 256, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 258, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 260, len 0, h: end attributes[0] 
-// parsed:, offset 260, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 260, len:42,desc: ()I
-// parsed:, offset 260, len 0, h:  methods[1]: 
-    // parsed:, offset 260, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 262, len 2, h: name: run
-    // .  .  
-       00 09 
-    // parsed:, offset 264, len 2, h: descriptor: ()I
-    // .  .  
-       00 08 
-    // parsed:, offset 266, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 268, len 0, h:  attributes[0]: 
-        // parsed:, offset 268, len 2, h: name: Code
-        // .  .  
-           00 06 
-        // parsed:, offset 270, len 4, h: length: 00000012
-        // .  .  .  .  
-           00 00 00 12 
-        // parsed:, offset 274, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 276, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 278, len 4, h: code_length: 00000006
-        // .  .  .  .  
-           00 00 00 06 
-        // parsed:, offset 0, len 2, h: 0000: ldc #-0012d687
-        // .  .  
-           12 12 
-        // parsed:, offset 2, len 3, h: 0002: invokestatic method{java.lang.Math.abs:(I)I}
-        // .  .  .  
-//@mod           b8 00 0d           
-           b8 00 0e 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 288, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 290, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 292, len 0, h: end attributes[0] 
-// parsed:, offset 292, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()I
-// parsed:, offset 292, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 294, len 0, h:  attributes[0]: 
-    // parsed:, offset 294, len 2, h: name: SourceFile
-    // .  .  
-       00 07 
-    // parsed:, offset 296, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 300, len 2, h: source: utf8{"T_invokestatic_3.java"}
-    // .  .  
-       00 14 
-// parsed:, offset 302, len 0, h: end attributes[0] 
-// parsed:, offset 302, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3.j
deleted file mode 100644
index 271a935..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3.j
+++ /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_invokestatic_3.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    ldc -1234567
-    invokestatic java/lang/Math/abs(I)I
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_3.java
deleted file mode 100644
index e6fb064..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_3 {
-
-    public int run() {
-        return Math.abs(-1234567);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_4.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_4.j
deleted file mode 100644
index f8c2bb1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_4.j
+++ /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_invokestatic_4.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_4
-.super java/lang/Object
-
-.field static v2 J
-
-.method static <clinit>()V
-    .limit stack 2
-    .limit locals 0
-
-    ldc2_w 123456789
-    putstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_4.v2 J
-    return
-.end method
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()J
-    .limit stack 2
-    .limit locals 2
-
-    getstatic dxc.junit.opcodes.invokestatic.jm.T_invokestatic_4.v2 J
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_4.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_4.java
deleted file mode 100644
index d87b044..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_4 {
-
-    static long v2 = 123456789l;
-
-    public static long run() {
-        return v2;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_5.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_5.j
deleted file mode 100644
index c75484f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_5.j
+++ /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_invokestatic_5.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    iconst_5
-    invokestatic dxc/junit/opcodes/invokestatic/jm/T_invokestatic_5/test(I)I
-    ireturn
-
-.end method
-
-.method public test(I)I
-    .limit stack 1
-    .limit locals 2
-
-    iload_1
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_5.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_5.java
deleted file mode 100644
index c9448c1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_5.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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_5 {
-    
-    public int run() {
-        return test(5);
-    }
-    
-    public int test(int i1) {
-        return i1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_6.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_6.j
deleted file mode 100644
index 3ad06d8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_6.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokestatic_6.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static native test()V
-.end method
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/invokestatic/jm/T_invokestatic_6/test()V
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_6.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_6.java
deleted file mode 100644
index 4d38858..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_6 {
-
-    public static native void test();
-    
-    public void run() {
-        test();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_7.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_7.j
deleted file mode 100644
index 97d9b7b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_7.j
+++ /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_invokestatic_7.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_7
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static test()V
-    .limit stack 0
-    .limit locals 0
-    return
-.end method
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/invokestatic/jm/T_invokestatic_7/test1()V
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_7.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_7.java
deleted file mode 100644
index 187b33d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_7.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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_7 {
-    
-    public static void test(){
-    }
-    
-    public void run(){
-        test();
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_8.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_8.j
deleted file mode 100644
index fdc33e2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_8.j
+++ /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_invokestatic_8.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    invokestatic dxc/junit/opcodes/invokestatic/jm/TestClass/testPvt()V
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_8.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_8.java
deleted file mode 100644
index 35a3157..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_8 {
-    
-    public void run(){
-        TestClass.test();
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9.cfh b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9.cfh
deleted file mode 100644
index 7add6ce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9.cfh
+++ /dev/null
@@ -1,206 +0,0 @@
-//@class:dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0015
-// .  .  
-   00 15 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 19, h: 0001: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 29, len 9, h: 0002: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 38, len 3, h: 0003: type{java.lang.Object}
-    // .  .  .  
-       07 00 01 
-    // parsed:, offset 41, len 5, h: 0004: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 02 00 05 
-    // parsed:, offset 46, len 6, h: 0005: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 52, len 7, h: 0006: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 59, len 13, h: 0007: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 72, len 53, h: 0008: utf8{"dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9"}
-    // .  .  2  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  s  t  a  t  i  c  /  j  m  /  T  _  i  n  v  o  k  e  s  t  a  t  i  c  _  9  
-       01 00 32 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 73 74 61 74 69 63 2f 6a 6d 2f 54 5f 69 6e 76 6f 6b 65 73 74 61 74 69 63 5f 39 
-    // parsed:, offset 125, len 6, h: 0009: utf8{"()I"}
-    // .  .  .  (  )  I  
-       01 00 03 28 29 49 
-    // parsed:, offset 131, len 6, h: 000a: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 137, len 3, h: 000b: type{java.lang.Math}
-    // .  .  .  
-       07 00 12 
-    // parsed:, offset 140, len 6, h: 000c: utf8{"abs"}
-    // .  .  .  a  b  s  
-       01 00 03 61 62 73 
-    // parsed:, offset 146, len 5, h: 000d: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 03 00 04 
-    // parsed:, offset 151, len 5, h: 000e: method{java.lang.Math.abs:(I)I}
-    // .  .  .  .  .  
-       0a 00 0b 00 14 
-    // parsed:, offset 156, len 3, h: 000f: type{dxc.junit.opcodes.invokestatic.jm.T_invokestatic_9}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 159, len 24, h: 0010: utf8{"T_invokestatic_9.java"}
-    // .  .  .  T  _  i  n  v  o  k  e  s  t  a  t  i  c  _  9  .  j  a  v  a  
-       01 00 15 54 5f 69 6e 76 6f 6b 65 73 74 61 74 69 63 5f 39 2e 6a 61 76 61 
-    // parsed:, offset 183, len 7, h: 0011: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-    // parsed:, offset 190, len 17, h: 0012: utf8{"java/lang/Math"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  M  a  t  h  
-       01 00 0e 6a 61 76 61 2f 6c 61 6e 67 2f 4d 61 74 68 
-    // parsed:, offset 207, len 5, h: 0013: int{0xffed2979 / -1234567}
-    // .  .  .  )  y  
-       03 ff ed 29 79 
-    // parsed:, offset 212, len 5, h: 0014: nat{abs:(I)I}
-    // .  .  .  .  .  
-       0c 00 0c 00 11 
-// parsed:, offset 217, len 0, h: end constant_pool
-// parsed:, offset 217, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 219, len 2, h: this_class: type{dxc.junit.opcodes.invokestatic.jm.T_invokestatic_9}
-// .  .  
-   00 0f 
-// parsed:, offset 221, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 03 
-// parsed:, offset 223, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 225, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 227, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 229, len:73,desc: ()V
-// parsed:, offset 229, len 0, h:  methods[0]: 
-    // parsed:, offset 229, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 231, len 2, h: name: <init>
-    // .  .  
-       00 02 
-    // parsed:, offset 233, len 2, h: descriptor: ()V
-    // .  .  
-       00 05 
-    // parsed:, offset 235, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 237, len 0, h:  attributes[0]: 
-        // parsed:, offset 237, len 2, h: name: Code
-        // .  .  
-           00 06 
-        // parsed:, offset 239, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 243, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 245, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 247, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 0d 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 256, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 258, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 260, len 0, h: end attributes[0] 
-// parsed:, offset 260, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 260, len:42,desc: ()I
-// parsed:, offset 260, len 0, h:  methods[1]: 
-    // parsed:, offset 260, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 262, len 2, h: name: run
-    // .  .  
-       00 0a 
-    // parsed:, offset 264, len 2, h: descriptor: ()I
-    // .  .  
-       00 09 
-    // parsed:, offset 266, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 268, len 0, h:  attributes[0]: 
-        // parsed:, offset 268, len 2, h: name: Code
-        // .  .  
-           00 06 
-        // parsed:, offset 270, len 4, h: length: 00000012
-        // .  .  .  .  
-           00 00 00 12 
-        // parsed:, offset 274, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 276, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 278, len 4, h: code_length: 00000006
-        // .  .  .  .  
-           00 00 00 06 
-        // parsed:, offset 0, len 2, h: 0000: ldc #-0012d687
-        // .  .  
-           12 13 
-        // parsed:, offset 2, len 3, h: 0002: invokestatic method{java.lang.Math.abs:(I)I}
-        // .  .  .  
-//@mod           b8 00 0e           
-           b8 01 0e 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 288, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 290, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 292, len 0, h: end attributes[0] 
-// parsed:, offset 292, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()I
-// parsed:, offset 292, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 294, len 0, h:  attributes[0]: 
-    // parsed:, offset 294, len 2, h: name: SourceFile
-    // .  .  
-       00 07 
-    // parsed:, offset 296, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 300, len 2, h: source: utf8{"T_invokestatic_9.java"}
-    // .  .  
-       00 10 
-// parsed:, offset 302, len 0, h: end attributes[0] 
-// parsed:, offset 302, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9.j b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9.j
deleted file mode 100644
index edcc8c6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9.j
+++ /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_invokestatic_9.java
-.class public dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    ldc -1234567
-    invokestatic java/lang/Math/abs(I)I
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_9.java
deleted file mode 100644
index 4944efd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/T_invokestatic_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 dxc.junit.opcodes.invokestatic.jm;
-
-public class T_invokestatic_9 {
-    
-    public int run() {
-        return Math.abs(-1234567);
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/TestClass.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/TestClass.java
deleted file mode 100644
index ef8723f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/TestClass.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 dxc.junit.opcodes.invokestatic.jm;
-
-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 int testP(){
-        return 888;
-    }
-    
-    private static void testPvt(){
-        
-    }
-}
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/TestClassAbstract.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/TestClassAbstract.java
deleted file mode 100644
index 5d24d39..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/TestClassAbstract.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 dxc.junit.opcodes.invokestatic.jm;
-
-public abstract class TestClassAbstract {
-    
-    public abstract void test();
-}
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/TestClassInitError.java b/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/TestClassInitError.java
deleted file mode 100644
index c2d176e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokestatic/jm/TestClassInitError.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokestatic.jm;
-
-public class TestClassInitError {
-    static int a = 1 / 0;
-    public static void test() {
-        
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/TProtected.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/TProtected.java
deleted file mode 100644
index 78c0ddb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/TProtected.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 dxc.junit.opcodes.invokevirtual;
-
-public class TProtected {
-
-    @SuppressWarnings("unused")
-    private void TestStub() {
-        // used by testE6
-    }
-    
-
-    protected void TestStubP() {
-        // used by testE7
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/Test_invokevirtual.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/Test_invokevirtual.java
deleted file mode 100644
index 1726067..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/Test_invokevirtual.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokevirtual;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_1;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_13;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_14;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_15;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_17;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_18;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_19;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_2;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_20;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_3;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_4;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_5;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_6;
-import dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_7;
-
-public class Test_invokevirtual extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_invokevirtual_1 t = new T_invokevirtual_1();
-        int a = 1;
-        String sa = "a" + a;
-        String sb = "a1";
-        assertTrue(t.run(sa, sb));
-        assertFalse(t.run(this, sa));
-        assertFalse(t.run(sb, this));
-    }
-
-    /**
-     * @title  Check that monitor is acquired if method is synchronized
-     */
-    public void testN2() {
-        assertTrue(T_invokevirtual_2.execute());
-    }
-
-    /**
-     * @title  Invoke protected method of superclass
-     */
-    public void testN3() {
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TSuper
-        T_invokevirtual_7 t = new T_invokevirtual_7();
-        assertEquals(5, t.run());
-    }
-
-    /**
-     * @title  Private method call
-     */
-    public void testN4() {
-        T_invokevirtual_13 t = new T_invokevirtual_13();
-        assertEquals(345, t.run());
-    }
-
-    /**
-     * @title  Check that new frame is created by invokevirtual and
-     * arguments are passed to method
-     */
-    public void testN5() {
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TSuper
-        T_invokevirtual_14 t = new T_invokevirtual_14();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  Recursion of method lookup procedure
-     */
-    public void testN6() {
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TSuper
-        T_invokevirtual_17 t = new T_invokevirtual_17();
-        assertEquals(5, t.run());
-    }
-
-    /**
-     * @title 
-     */
-    public void testE1() {
-        T_invokevirtual_3 t = new T_invokevirtual_3();
-        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_invokevirtual_4 t = new T_invokevirtual_4();
-        try {
-            t.run();
-            fail("expected UnsatisfiedLinkError");
-        } catch (UnsatisfiedLinkError ule) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Attempt to invoke static method
-     */
-    public void testE3() {
-        try {
-            T_invokevirtual_5 t = new T_invokevirtual_5();
-            t.run();
-            fail("expected IncompatibleClassChangeError");
-        } catch (IncompatibleClassChangeError icce) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Attempt to invoke abstract method
-     */
-    public void testE4() {
-        // @uses dxc.junit.opcodes.invokevirtual.jm.ATest
-        T_invokevirtual_6 t = new T_invokevirtual_6();
-        try {
-            t.run();
-            fail("expected AbstractMethodError");
-        } catch (AbstractMethodError iae) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Attempt to invoke non-existing method
-     */
-    public void testE5() {
-        try {
-            T_invokevirtual_15 t = new T_invokevirtual_15();
-            t.run();
-            fail("expected NoSuchMethodError");
-        } catch (NoSuchMethodError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Attempt to invoke private method of other class
-     */
-    public void testE6() {
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TSuper
-        // @uses dxc.junit.opcodes.invokevirtual.TProtected
-        try {
-            T_invokevirtual_18 t = new T_invokevirtual_18();
-            t.run(new TProtected());
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Attempt to invoke protected method of other class
-     */
-    public void testE7() {
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TSuper
-        // @uses dxc.junit.opcodes.invokevirtual.TProtected
-        try {
-            T_invokevirtual_20 t = new T_invokevirtual_20();
-            t.run(new TProtected());
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  method has different signature
-     */
-    public void testE8() {
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TSuper
-        try {
-            T_invokevirtual_19 t = new T_invokevirtual_19();
-            t.run();
-            fail("expected NoSuchMethodError");
-        } catch (NoSuchMethodError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.13 
-     * @title valid index into constant pool table
-     */
-    public void testVFE1() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.13
-     * @title invalid index into constant pool table
-     */
-    public void testVFE2() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.14 
-     * @title &lt;clinit&gt; may not be called using invokevirtual
-     */
-    public void testVFE3() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1 
-     * @title number of arguments passed to method
-     */
-    public void testVFE4() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_11");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1 
-     * @title type of argument - int
-     */
-    public void testVFE5() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_12");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.14 
-     * @title &lt;init&gt; may not be called using invokevirtual
-     */
-    public void testVFE6() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_16");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.12 
-     * @title types of arguments passed to method
-     */
-    public void testVFE7() {
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TSuper
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_21");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.13 
-     * @title assignment incompatible references when accessing
-     *                  protected method
-     */
-    public void testVFE8() {
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TSuper
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TPlain
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_22");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.13 
-     * @title assignment incompatible references when accessing
-     *                  public method
-     */
-    public void testVFE9() {
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TSuper
-        // @uses dxc.junit.opcodes.invokevirtual.jm.TSuper2
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_23");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/ATest.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/ATest.java
deleted file mode 100644
index d0189ac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/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 dxc.junit.opcodes.invokevirtual.jm;
-
-public abstract class ATest {
-    
-    public abstract void test();       
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/TPlain.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/TPlain.java
deleted file mode 100644
index 2939359..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/TPlain.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.
- */
-
-/** Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dxc.junit.opcodes.invokevirtual.jm;
-
-/**
- * @author fjost
- *
- */
-public class TPlain {
-    public int toInt() {
-        return 1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/TSuper.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/TSuper.java
deleted file mode 100644
index cc198ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/TSuper.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/** Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dxc.junit.opcodes.invokevirtual.jm;
-
-/**
- * @author fjost
- *
- */
-public class TSuper {
-    public int toInt() {
-        return 5;
-    }
-    
-    public int toInt(float v) {
-        return (int)v;
-    }
-    
-    public native int toIntNative();
-    
-    public static int toIntStatic() {
-        return 5;
-    }
-    
-    protected int toIntP() {
-        return 5;
-    }
-    
-    private int toIntPvt() {
-        return 5;
-    }
-    
-    public int testArgsOrder(int a, int b){
-        int i = 349;
-        int j = 344656;
-        return a / b;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/TSuper2.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/TSuper2.java
deleted file mode 100644
index 6fcbefe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/TSuper2.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 dxc.junit.opcodes.invokevirtual.jm;
-
-import dxc.junit.opcodes.invokespecial.jm.TSuper;
-
-public class TSuper2 extends TSuper {
-    
-    public int test() {
-        return 13;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_1.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_1.j
deleted file mode 100644
index b64e0c7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokevirtual_1.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-    aload_1
-    aload_2
-    invokevirtual java/lang/Object/equals(Ljava/lang/Object;)Z
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_1.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_1.java
deleted file mode 100644
index 1bbaec3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_1 {
-
-    public boolean run(Object x, Object y) {
-        return x.equals(y);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_10.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_10.j
deleted file mode 100644
index e12428b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_10.j
+++ /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.
-
-.source T_invokevirtual_10.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_10
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokevirtual java/lang/Object/<clinit>()V
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_10.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_10.java
deleted file mode 100644
index 0bdaf58..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_10 {
-    
-    public void run() {
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_11.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_11.j
deleted file mode 100644
index 5fb634d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_11.j
+++ /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_invokevirtual_11.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-;    aload_1
-    invokevirtual java/lang/Object/equals(Ljava/lang/Object;)Z
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_11.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_11.java
deleted file mode 100644
index 7c28cae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_11 {
-    
-    public boolean run(Object x, Object y) {
-        return x.equals(y);
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_12.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_12.j
deleted file mode 100644
index 293a6e5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_12.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokevirtual_12.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_12
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-
-    iconst_1
-    aload_1
-    invokevirtual java/lang/Object/equals(Ljava/lang/Object;)Z
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_12.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_12.java
deleted file mode 100644
index 62e1971..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_12 {
-
-    public boolean run(Object x, Object y) {
-        return x.equals(y);
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_13.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_13.j
deleted file mode 100644
index f7f0f0a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_13.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokevirtual_13.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_13
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    aload_0
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_13/getInt()I
-    ireturn
-.end method
-
-.method private getInt()I
-    sipush 345
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_13.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_13.java
deleted file mode 100644
index dfa6179..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_13 {
-    
-    public int run() {
-        return getInt();
-    }
-
-    private int getInt() {
-        return 345;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_14.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_14.j
deleted file mode 100644
index ebbad2c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_14.j
+++ /dev/null
@@ -1,59 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokevirtual_14.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_14
-.super dxc/junit/opcodes/invokevirtual/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TSuper/<init>()V
-    return
-.end method
-
-
-.method public run()Z
-    .limit stack 3
-    .limit locals 3
-
-    bipush 123
-    istore_1
-
-    sipush 659
-    istore_2
-
-    aload_0
-    sipush 300
-    iconst_3
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_14/testArgsOrder(II)I
-
-    bipush 100
-    if_icmpne Label0
-
-    iload_1
-    bipush 123
-    if_icmpne Label0
-
-    iload_2
-    sipush 659
-    if_icmpne Label0
-
-    iconst_1
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_14.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_14.java
deleted file mode 100644
index d039fbe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_14.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 dxc.junit.opcodes.invokevirtual.jm;
-
-import dxc.junit.opcodes.invokevirtual.jm.TSuper;
-
-    
-public class T_invokevirtual_14 extends TSuper {
-
-    public boolean run() {
-        int a = 123;
-        int b = 659;
-        if(testArgsOrder(300, 3) == 100)
-            if(a == 123)
-                if(b == 659)
-                    return true;
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_15.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_15.j
deleted file mode 100644
index 61a84e0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_15.j
+++ /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_invokevirtual_15.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_15
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public test()V
-    .limit stack 0
-    .limit locals 1
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_15/test1()V
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_15.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_15.java
deleted file mode 100644
index fae4bba..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_15.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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_15 {
-    
-    public void test(){
-    }
-    
-    public void run() {
-        test();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_16.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_16.j
deleted file mode 100644
index fc2d18c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_16.j
+++ /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.
-
-.source T_invokevirtual_16.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_16
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokevirtual java/lang/Object/<init>()V
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_16.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_16.java
deleted file mode 100644
index c30e960..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_16 {
-    
-    public void run() {
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_17.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_17.j
deleted file mode 100644
index ac29622..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_17.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokevirtual_17.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_17
-.super dxc/junit/opcodes/invokevirtual/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TSuper/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_17/toInt()I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_17.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_17.java
deleted file mode 100644
index 639d499..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_17.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 dxc.junit.opcodes.invokevirtual.jm;
-
-import dxc.junit.opcodes.invokevirtual.jm.TSuper;
-
-    
-public class T_invokevirtual_17 extends TSuper {
-
-    public int run() {
-        return toInt();
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_18.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_18.j
deleted file mode 100644
index c38f212..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_18.j
+++ /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_invokevirtual_18.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_18
-.super dxc/junit/opcodes/invokevirtual/jm/TSuper
-
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TSuper/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ldxc/junit/opcodes/invokevirtual/TProtected;)V
-    .limit stack 1
-    .limit locals 2
-
-    aload_1
-    invokevirtual dxc/junit/opcodes/invokevirtual/TProtected/TestStub()V
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_18.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_18.java
deleted file mode 100644
index d027bf2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_18.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 dxc.junit.opcodes.invokevirtual.jm;
-
-import dxc.junit.opcodes.invokevirtual.TProtected;
-
-
-    
-public class T_invokevirtual_18 extends TSuper {
-
-    public void run(TProtected obj) {
-        //obj.TestStub();
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_19.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_19.j
deleted file mode 100644
index 1214d1b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_19.j
+++ /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_invokevirtual_19.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_19
-.super dxc/junit/opcodes/invokevirtual/jm/TSuper
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TSuper/<init>()V
-    return
-.end method
-
-
-
-.method public run()I
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    iconst_1
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_19/toInt(I)I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_19.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_19.java
deleted file mode 100644
index 564c27f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_19.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 dxc.junit.opcodes.invokevirtual.jm;
-
-import dxc.junit.opcodes.invokevirtual.jm.TSuper;
-
-    
-public class T_invokevirtual_19 extends TSuper {
-
-    public int run() {
-        return toInt(3.14f);
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_2.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_2.j
deleted file mode 100644
index 0386883..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_2.j
+++ /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.
-
-.source T_invokevirtual_2.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_2
-.super java/lang/Object
-.implements java/lang/Runnable
-
-.field  value I
-.field  failed Z
-
-.method public <init>()V
-    .limit stack 2
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_2.value I
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_2.failed Z
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-
-    iconst_0
-    istore_1
-
-Label1:
-    aload_0
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_2/test()V
-
-    iinc 1 1
-
-Label0:
-    iload_1
-    sipush 1000
-    if_icmplt Label1
-
-    return
-.end method
-
-
-
-.method public synchronized test()V
-    .limit stack 3
-    .limit locals 2
-
-    aload_0
-    dup
-    getfield dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_2.value I
-    iconst_1
-    iadd
-    putfield dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_2.value I
-
-    aload_0
-    getfield dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_2.value I
-    istore_1
-
-    invokestatic java/lang/Thread/yield()V
-
-    iload_1
-    aload_0
-    getfield dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_2.value I
-    if_icmpeq Label0
-
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_2.failed Z
-
-Label0:
-    return
-.end method
-
-
-
-.method public static execute()Z
-    .limit stack 3
-    .limit locals 4
-
-    new dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_2
-    dup
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_2/<init>()V
-    astore_0
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_1
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_2
-
-    aload_1
-    invokevirtual java/lang/Thread/start()V
-
-    aload_2
-    invokevirtual java/lang/Thread/start()V
-
-Label12:
-    ldc2_w 5000
-    invokestatic java/lang/Thread/sleep(J)V
-
-Label13:
-    goto Label0
-
-Label14:
-    astore_3
-
-    iconst_0
-    ireturn
-
-Label0:
-    aload_0
-    getfield dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_2.value I
-    sipush 2000
-    if_icmpeq Label1
-
-    iconst_0
-    ireturn
-
-Label1:
-
-    aload_0
-    getfield dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_2.failed Z
-    ifeq Label2
-    iconst_0
-    ireturn
-
-Label2:
-    iconst_1
-    ireturn
-
-.catch java/lang/InterruptedException from Label12 to Label13 using Label14
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_2.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_2.java
deleted file mode 100644
index 92bb8a8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_2.java
+++ /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.
- */
-
-package dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_2 implements Runnable {
-    public final static int CNT = 1000;
-    int value = 0;
-    boolean failed = false;
-    
-    public void run() {
-        for(int i = 0; i < CNT; i++) {
-            test();
-        }
-    }
-    
-    public synchronized void test()    {
-        value++;
-        int c = value;
-        Thread.yield();
-        if(c != value)
-            failed = true;
-    }
-    
-    public static boolean execute() {
-        T_invokevirtual_2 test = new T_invokevirtual_2();
-        Thread t1 = new Thread(test);
-        Thread t2 = new Thread(test);
-        
-        t1.start();
-        t2.start();
-        
-        try
-        {
-            Thread.sleep(5000);
-        }
-        catch(InterruptedException ie) {
-            return false;
-        }
-        
-        if(test.value != CNT * 2)
-            return false;
-        return !test.failed;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_20.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_20.j
deleted file mode 100644
index e340162..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_20.j
+++ /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_invokevirtual_20.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_20
-.super dxc/junit/opcodes/invokevirtual/jm/TSuper
-
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TSuper/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ldxc/junit/opcodes/invokevirtual/TProtected;)V
-    .limit stack 1
-    .limit locals 2
-
-    aload_1
-    invokevirtual dxc/junit/opcodes/invokevirtual/TProtected/TestStubP()V
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_20.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_20.java
deleted file mode 100644
index aa2c8d8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-import dxc.junit.opcodes.invokevirtual.TProtected;
-
-    
-public class T_invokevirtual_20 extends TSuper {
-
-    public void run(TProtected obj) {
-        //obj.TestStubP();
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_21.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_21.j
deleted file mode 100644
index af0a530..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_21.j
+++ /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_invokevirtual_21.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_21
-.super dxc/junit/opcodes/invokevirtual/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TSuper/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 3
-    .limit locals 1
-
-    aload_0
-;    ldc 5.0
-    dconst_1
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_21/toInt(F)I
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_21.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_21.java
deleted file mode 100644
index 50333e8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_21.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_21 extends TSuper {
-
-    public int run() {
-        return toInt(5f);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_22.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_22.j
deleted file mode 100644
index d3c3164..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_22.j
+++ /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_invokevirtual_22.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_22
-.super dxc/junit/opcodes/invokevirtual/jm/TSuper
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TSuper/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 2
-    .limit locals 2
-
-    new dxc/junit/opcodes/invokevirtual/jm/TPlain
-    dup
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TPlain/<init>()V
-
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/TSuper/toIntP()I
-
-    Label1:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_22.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_22.java
deleted file mode 100644
index b002637..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_22.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 dxc.junit.opcodes.invokevirtual.jm;
-
-import dxc.junit.opcodes.invokevirtual.jm.TSuper;
-
-public class T_invokevirtual_22 extends TSuper {
-
-    public int run() {
-        TPlain p = new TPlain();
-        return p.toInt();
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_23.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_23.j
deleted file mode 100644
index 8c7eec8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_23.j
+++ /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_invokevirtual_23.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_23
-.super dxc/junit/opcodes/invokevirtual/jm/TSuper2
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TSuper2/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-    .limit locals 2
-    
-    new dxc/junit/opcodes/invokevirtual/jm/TSuper
-    dup
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TSuper/<init>()V
-
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/TSuper2/test()I
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_23.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_23.java
deleted file mode 100644
index b2ef484..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_23.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_23 extends TSuper2 {
-    
-    public int run() {
-        return super.test();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_3.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_3.j
deleted file mode 100644
index c1fd20f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokevirtual_3.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-    aload_1
-    aload_2
-    invokevirtual java/lang/Object/equals(Ljava/lang/Object;)Z
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_3.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_3.java
deleted file mode 100644
index 8f0fb67..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_3 {
-
-    public boolean run(Object x, Object y) {
-        return x.equals(y);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_4.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_4.j
deleted file mode 100644
index c4efa88..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_4.j
+++ /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_invokevirtual_4.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public native test()V
-.end method
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_4/test()V
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_4.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_4.java
deleted file mode 100644
index 08a969b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_4 {
-    
-    public native void test();
-
-    public void run() {
-        test();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_5.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_5.j
deleted file mode 100644
index d751a75..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_5.j
+++ /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_invokevirtual_5.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static test()V
-    .limit stack 0
-    .limit locals 1
-    return
-.end method
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_5/test()V
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_5.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_5.java
deleted file mode 100644
index c931ce4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_5.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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_5 {
-    
-    public void test(){
-    }
-
-    public void run() {
-        test();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_6.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_6.j
deleted file mode 100644
index 56612ff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_6.j
+++ /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_invokevirtual_6.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_6
-.super dxc/junit/opcodes/invokevirtual/jm/ATest
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/ATest/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/ATest/test()V
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_6.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_6.java
deleted file mode 100644
index 0d18e83..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_6.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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_6 extends ATest {
-    
-    public void test(){
-        int i = 2+5;
-    }
-
-    public void run() {
-        test();
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_7.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_7.j
deleted file mode 100644
index 07e6f88..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_7.j
+++ /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 T_invokevirtual_7.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_7
-.super dxc/junit/opcodes/invokevirtual/jm/TSuper
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/invokevirtual/jm/TSuper/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokevirtual dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_7/toIntP()I
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_7.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_7.java
deleted file mode 100644
index abff1db..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_7.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 dxc.junit.opcodes.invokevirtual.jm;
-
-import dxc.junit.opcodes.invokevirtual.jm.TSuper;
-
-    
-public class T_invokevirtual_7 extends TSuper {
-
-    public int run() {
-        return toIntP();
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8.cfh b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8.cfh
deleted file mode 100644
index d8991a9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 25, h: 0001: utf8{"T_invokevirtual_8.java"}
-    // .  .  .  T  _  i  n  v  o  k  e  v  i  r  t  u  a  l  _  8  .  j  a  v  a  
-       01 00 16 54 5f 69 6e 76 6f 6b 65 76 69 72 74 75 61 6c 5f 38 2e 6a 61 76 61 
-    // parsed:, offset 35, len 5, h: 0002: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 11 00 09 
-    // parsed:, offset 40, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 59, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 72, len 24, h: 0005: utf8{"(Ljava/lang/Object;)Z"}
-    // .  .  .  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  Z  
-       01 00 15 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 5a 
-    // parsed:, offset 96, len 9, h: 0006: utf8{"equals"}
-    // .  .  .  e  q  u  a  l  s  
-       01 00 06 65 71 75 61 6c 73 
-    // parsed:, offset 105, len 9, h: 0007: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 114, len 6, h: 0008: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 120, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 07 00 0f 
-    // parsed:, offset 125, len 5, h: 000a: method{java.lang.Object.equals:(Ljava/lang/Object;)Z}
-    // .  .  .  .  .  
-       0a 00 11 00 0e 
-    // parsed:, offset 130, len 7, h: 000b: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 137, len 42, h: 000c: utf8{"(Ljava/lang/Object;Ljava/lang/Object;)Z"}
-    // .  .  '  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  Z  
-       01 00 27 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 5a 
-    // parsed:, offset 179, len 55, h: 000d: utf8{"dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8"}
-    // .  .  4  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  v  i  r  t  u  a  l  /  j  m  /  T  _  i  n  v  o  k  e  v  i  r  t  u  a  l  _  8  
-       01 00 34 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 76 69 72 74 75 61 6c 2f 6a 6d 2f 54 5f 69 6e 76 6f 6b 65 76 69 72 74 75 61 6c 5f 38 
-    // parsed:, offset 234, len 5, h: 000e: nat{equals:(Ljava/lang/Object;)Z}
-    // .  .  .  .  .  
-       0c 00 06 00 05 
-    // parsed:, offset 239, len 6, h: 000f: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 245, len 3, h: 0010: type{dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_8}
-    // .  .  .  
-       07 00 0d 
-    // parsed:, offset 248, len 3, h: 0011: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 251, len 0, h: end constant_pool
-// parsed:, offset 251, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 253, len 2, h: this_class: type{dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_8}
-// .  .  
-   00 10 
-// parsed:, offset 255, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 11 
-// parsed:, offset 257, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 259, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 261, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 263, len:73,desc: ()V
-// parsed:, offset 263, len 0, h:  methods[0]: 
-    // parsed:, offset 263, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 265, len 2, h: name: <init>
-    // .  .  
-       00 07 
-    // parsed:, offset 267, len 2, h: descriptor: ()V
-    // .  .  
-       00 0f 
-    // parsed:, offset 269, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 271, len 0, h:  attributes[0]: 
-        // parsed:, offset 271, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 273, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 277, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 279, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 281, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 02 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 290, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 292, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 294, len 0, h: end attributes[0] 
-// parsed:, offset 294, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 294, len:42,desc: (Ljava/lang/Object;Ljava/lang/Object;)Z
-// parsed:, offset 294, len 0, h:  methods[1]: 
-    // parsed:, offset 294, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 296, len 2, h: name: run
-    // .  .  
-       00 08 
-    // parsed:, offset 298, len 2, h: descriptor: (Ljava/lang/Object;Ljava/lang/Object;)Z
-    // .  .  
-       00 0c 
-    // parsed:, offset 300, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 302, len 0, h:  attributes[0]: 
-        // parsed:, offset 302, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 304, len 4, h: length: 00000012
-        // .  .  .  .  
-           00 00 00 12 
-        // parsed:, offset 308, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 310, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 312, len 4, h: code_length: 00000006
-        // .  .  .  .  
-           00 00 00 06 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 1, h: 0001: aload_2 // 02
-        // ,  
-           2c 
-        // parsed:, offset 2, len 3, h: 0002: invokevirtual method{java.lang.Object.equals:(Ljava/lang/Object;)Z}
-        // .  .  .  
-//@mod           b6 00 0a
-           b6 00 0b 
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 322, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 324, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 326, len 0, h: end attributes[0] 
-// parsed:, offset 326, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/Object;Ljava/lang/Object;)Z
-// parsed:, offset 326, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 328, len 0, h:  attributes[0]: 
-    // parsed:, offset 328, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 330, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 334, len 2, h: source: utf8{"T_invokevirtual_8.java"}
-    // .  .  
-       00 01 
-// parsed:, offset 336, len 0, h: end attributes[0] 
-// parsed:, offset 336, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8.j
deleted file mode 100644
index 14fc66b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8.j
+++ /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_invokevirtual_8.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-    
-    aload_1
-    aload_2
-    invokevirtual java/lang/Object/equals(Ljava/lang/Object;)Z
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_8.java
deleted file mode 100644
index 4c9fac6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_8 {
-    
-    public boolean run(Object x, Object y) {
-        return x.equals(y);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9.cfh b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9.cfh
deleted file mode 100644
index a98e1d7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 11 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 24, h: 0004: utf8{"(Ljava/lang/Object;)Z"}
-    // .  .  .  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  Z  
-       01 00 15 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 5a 
-    // parsed:, offset 71, len 9, h: 0005: utf8{"equals"}
-    // .  .  .  e  q  u  a  l  s  
-       01 00 06 65 71 75 61 6c 73 
-    // parsed:, offset 80, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 89, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 95, len 25, h: 0008: utf8{"T_invokevirtual_9.java"}
-    // .  .  .  T  _  i  n  v  o  k  e  v  i  r  t  u  a  l  _  9  .  j  a  v  a  
-       01 00 16 54 5f 69 6e 76 6f 6b 65 76 69 72 74 75 61 6c 5f 39 2e 6a 61 76 61 
-    // parsed:, offset 120, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0f 
-    // parsed:, offset 125, len 5, h: 000a: method{java.lang.Object.equals:(Ljava/lang/Object;)Z}
-    // .  .  .  .  .  
-       0a 00 11 00 0e 
-    // parsed:, offset 130, len 7, h: 000b: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 137, len 42, h: 000c: utf8{"(Ljava/lang/Object;Ljava/lang/Object;)Z"}
-    // .  .  '  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  Z  
-       01 00 27 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 5a 
-    // parsed:, offset 179, len 55, h: 000d: utf8{"dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9"}
-    // .  .  4  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  i  n  v  o  k  e  v  i  r  t  u  a  l  /  j  m  /  T  _  i  n  v  o  k  e  v  i  r  t  u  a  l  _  9  
-       01 00 34 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 69 6e 76 6f 6b 65 76 69 72 74 75 61 6c 2f 6a 6d 2f 54 5f 69 6e 76 6f 6b 65 76 69 72 74 75 61 6c 5f 39 
-    // parsed:, offset 234, len 5, h: 000e: nat{equals:(Ljava/lang/Object;)Z}
-    // .  .  .  .  .  
-       0c 00 05 00 04 
-    // parsed:, offset 239, len 6, h: 000f: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 245, len 3, h: 0010: type{dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_9}
-    // .  .  .  
-       07 00 0d 
-    // parsed:, offset 248, len 3, h: 0011: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 251, len 0, h: end constant_pool
-// parsed:, offset 251, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 253, len 2, h: this_class: type{dxc.junit.opcodes.invokevirtual.jm.T_invokevirtual_9}
-// .  .  
-   00 10 
-// parsed:, offset 255, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 11 
-// parsed:, offset 257, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 259, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 261, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 263, len:73,desc: ()V
-// parsed:, offset 263, len 0, h:  methods[0]: 
-    // parsed:, offset 263, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 265, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 267, len 2, h: descriptor: ()V
-    // .  .  
-       00 0f 
-    // parsed:, offset 269, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 271, len 0, h:  attributes[0]: 
-        // parsed:, offset 271, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 273, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 277, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 279, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 281, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 290, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 292, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 294, len 0, h: end attributes[0] 
-// parsed:, offset 294, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 294, len:42,desc: (Ljava/lang/Object;Ljava/lang/Object;)Z
-// parsed:, offset 294, len 0, h:  methods[1]: 
-    // parsed:, offset 294, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 296, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 298, len 2, h: descriptor: (Ljava/lang/Object;Ljava/lang/Object;)Z
-    // .  .  
-       00 0c 
-    // parsed:, offset 300, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 302, len 0, h:  attributes[0]: 
-        // parsed:, offset 302, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 304, len 4, h: length: 00000012
-        // .  .  .  .  
-           00 00 00 12 
-        // parsed:, offset 308, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 310, len 2, h: max_locals: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 312, len 4, h: code_length: 00000006
-        // .  .  .  .  
-           00 00 00 06 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 1, h: 0001: aload_2 // 02
-        // ,  
-           2c 
-        // parsed:, offset 2, len 3, h: 0002: invokevirtual method{java.lang.Object.equals:(Ljava/lang/Object;)Z}
-        // .  .  .  
-//@mod           b6 00 0a 
-           b6 01 0a           
-        // parsed:, offset 5, len 1, h: 0005: ireturn
-        // .  
-           ac 
-        // parsed:, offset 322, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 324, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 326, len 0, h: end attributes[0] 
-// parsed:, offset 326, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/Object;Ljava/lang/Object;)Z
-// parsed:, offset 326, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 328, len 0, h:  attributes[0]: 
-    // parsed:, offset 328, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 330, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 334, len 2, h: source: utf8{"T_invokevirtual_9.java"}
-    // .  .  
-       00 08 
-// parsed:, offset 336, len 0, h: end attributes[0] 
-// parsed:, offset 336, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9.j b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9.j
deleted file mode 100644
index d72271b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_invokevirtual_9.java
-.class public dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    aload_2
-    invokevirtual java/lang/Object/equals(Ljava/lang/Object;)Z
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9.java b/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_9.java
deleted file mode 100644
index 22b9bb0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/invokevirtual/jm/T_invokevirtual_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 dxc.junit.opcodes.invokevirtual.jm;
-
-public class T_invokevirtual_9 {
-    
-    public boolean run(Object x, Object y) {
-        return x.equals(y);
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/Test_ior.java b/tools/dx-tests/src/dxc/junit/opcodes/ior/Test_ior.java
deleted file mode 100644
index e035cf3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/Test_ior.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 dxc.junit.opcodes.ior;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ior.jm.T_ior_1;
-
-public class Test_ior extends DxTestCase {
-
-    /**
-     * @title Arguments = 15, 8
-     */
-    public void testN1() {
-        T_ior_1 t = new T_ior_1();
-        assertEquals(15, t.run(15, 8));
-    }
-
-    /**
-     * @title Arguments = 0xfffffff8, 0xfffffff1 
-     */
-    public void testN2() {
-        T_ior_1 t = new T_ior_1();
-        assertEquals(0xfffffff9, t.run(0xfffffff8, 0xfffffff1));
-    }
-
-    /**
-     * @title  Arguments = 0xcafe & -1
-     */
-    public void testN3() {
-        T_ior_1 t = new T_ior_1();
-        assertEquals(-1, t.run(0xcafe, -1));
-    }
-
-    /**
-     * @title  Arguments = 0 & -1
-     */
-    public void testB1() {
-        T_ior_1 t = new T_ior_1();
-        assertEquals(-1, t.run(0, -1));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE & Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_ior_1 t = new T_ior_1();
-        assertEquals(0xffffffff, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ior.jm.T_ior_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ior.jm.T_ior_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long & int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ior.jm.T_ior_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference & int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ior.jm.T_ior_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_1.j
deleted file mode 100644
index 66611f1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ior_1.java
-.class public dxc/junit/opcodes/ior/jm/T_ior_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    ior
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_1.java
deleted file mode 100644
index 98f023e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_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 dxc.junit.opcodes.ior.jm;
-
-public class T_ior_1 {
-
-    public int run(int a, int b) {
-        return a | b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_2.j
deleted file mode 100644
index 39e9a3d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ior_2.java
-.class public dxc/junit/opcodes/ior/jm/T_ior_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-;    iload_2
-    ior
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_2.java
deleted file mode 100644
index db93a0b6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_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 dxc.junit.opcodes.ior.jm;
-
-public class T_ior_2 {
-
-    public int run(int a, int b) {
-        return a | b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_3.j
deleted file mode 100644
index fea22c5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ior_3.java
-.class public dxc/junit/opcodes/ior/jm/T_ior_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DI)I
-    .limit stack 3
-    .limit locals 4
-
-    dload_1
-    iload_3
-    ior
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_3.java
deleted file mode 100644
index d000987..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_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 dxc.junit.opcodes.ior.jm;
-
-public class T_ior_3 {
-
-    public int run(double a, int b) {
-        return (int)a | b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_4.j
deleted file mode 100644
index 1d21407..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_4.j
+++ /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_ior_4.java
-.class public dxc/junit/opcodes/ior/jm/T_ior_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(IJ)I
-    .limit stack 3
-    .limit locals 4
-
-    iload_1
-    lload_2
-    ior
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_4.java
deleted file mode 100644
index c8cc013..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_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 dxc.junit.opcodes.ior.jm;
-
-public class T_ior_4 {
-
-    public int run(int a, long b) {
-        return a | (int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_5.j
deleted file mode 100644
index 7528958..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ior_5.java
-.class public dxc/junit/opcodes/ior/jm/T_ior_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    ior
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_5.java
deleted file mode 100644
index 6dfc5aa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ior/jm/T_ior_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 dxc.junit.opcodes.ior.jm;
-
-public class T_ior_5 {
-    
-    public int run(int a, int b) {
-        return a | b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/Test_irem.java b/tools/dx-tests/src/dxc/junit/opcodes/irem/Test_irem.java
deleted file mode 100644
index ce72810..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/Test_irem.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.irem;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.irem.jm.T_irem_1;
-
-public class Test_irem extends DxTestCase {
-
-    /**
-     * @title Arguments = 8, 4
-     */
-    public void testN1() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(0, t.run(8, 4));
-    }
-
-    /**
-     * @title Arguments = 1073741823, 4
-     */
-    public void testN2() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(3, t.run(1073741823, 4));
-    }
-
-    /**
-     * @title  Dividend = 0
-     */
-    public void testN3() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(0, t.run(0, 4));
-    }
-
-    /**
-     * @title  Dividend is negative
-     */
-    public void testN4() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(-1, t.run(-10, 3));
-    }
-
-    /**
-     * @title  Divisor is negative
-     */
-    public void testN5() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(1, t.run(1073741824, -3));
-    }
-
-    /**
-     * @title  Both Dividend and divisor are negative
-     */
-    public void testN6() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(-697, t.run(-17895697, -3000));
-    }
-
-    /**
-     * @title Arguments = Integer.MIN_VALUE, -1
-     */
-    public void testB1() {
-        T_irem_1 t = new T_irem_1();
-        // result is MIN_VALUE because overflow occurs in this case
-        assertEquals(0, t.run(Integer.MIN_VALUE, -1));
-    }
-
-    /**
-     * @title Arguments = Integer.MIN_VALUE, 1
-     */
-    public void testB2() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(0, t.run(Integer.MIN_VALUE, 1));
-    }
-
-    /**
-     * @title Arguments = Integer.MAX_VALUE, 1
-     */
-    public void testB3() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(0, t.run(Integer.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title Arguments = Integer.MIN_VALUE, Integer.MAX_VALUE
-     */
-    public void testB4() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(-1, t.run(Integer.MIN_VALUE, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title Arguments = 1, Integer.MAX_VALUE
-     */
-    public void testB5() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(1, t.run(1, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title Arguments = 1, Integer.MIN_VALUE
-     */
-    public void testB6() {
-        T_irem_1 t = new T_irem_1();
-        assertEquals(1, t.run(1, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title  Divisor is 0
-     */
-    public void testE1() {
-        T_irem_1 t = new T_irem_1();
-        try {
-            t.run(1, 0);
-            fail("expected ArithmeticException");
-        } catch (ArithmeticException ae) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.irem.jm.T_irem_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int / double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.irem.jm.T_irem_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.irem.jm.T_irem_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference / int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.irem.jm.T_irem_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_1.j b/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_1.j
deleted file mode 100644
index 2f13c91..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_irem_1.java
-.class public dxc/junit/opcodes/irem/jm/T_irem_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    irem
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_1.java b/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_1.java
deleted file mode 100644
index e966dea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_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 dxc.junit.opcodes.irem.jm;
-
-public class T_irem_1 {
-
-    public int run(int a, int b) {
-        return a%b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_2.j b/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_2.j
deleted file mode 100644
index 9c9bf8b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_irem_2.java
-.class public dxc/junit/opcodes/irem/jm/T_irem_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    ; iload_2    
-    irem
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_2.java b/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_2.java
deleted file mode 100644
index 4ab9d2d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_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 dxc.junit.opcodes.irem.jm;
-
-public class T_irem_2 {
-
-    public int run(int a, int b) {
-        return a%b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_3.j b/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_3.j
deleted file mode 100644
index e07bfea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_irem_3.java
-.class public dxc/junit/opcodes/irem/jm/T_irem_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(ID)I
-    .limit stack 3
-    .limit locals 5
-    iload_1
-    dload_2    
-    irem
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_3.java b/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_3.java
deleted file mode 100644
index a7cbab2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_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 dxc.junit.opcodes.irem.jm;
-
-public class T_irem_3 {
-
-    public int run(int a, double b) {
-        return a%(int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_4.j b/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_4.j
deleted file mode 100644
index 7571e37..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_4.j
+++ /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_irem_4.java
-.class public dxc/junit/opcodes/irem/jm/T_irem_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JI)I
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-;    l2i
-    iload_3
-    irem
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_4.java b/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_4.java
deleted file mode 100644
index 75b8831..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_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 dxc.junit.opcodes.irem.jm;
-
-public class T_irem_4 {
-
-    public int run(long a, int b) {
-        return (int)a%b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_5.j b/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_5.j
deleted file mode 100644
index 803b81f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_irem_5.java
-.class public dxc/junit/opcodes/irem/jm/T_irem_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    irem
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_5.java b/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_5.java
deleted file mode 100644
index 397fb9c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/irem/jm/T_irem_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 dxc.junit.opcodes.irem.jm;
-
-public class T_irem_5 {
-    
-    public int run(int a, int b) {
-        return a%b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/Test_ireturn.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/Test_ireturn.java
deleted file mode 100644
index cdb6450..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/Test_ireturn.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 dxc.junit.opcodes.ireturn;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ireturn.jm.T_ireturn_1;
-import dxc.junit.opcodes.ireturn.jm.T_ireturn_6;
-import dxc.junit.opcodes.ireturn.jm.T_ireturn_7;
-import dxc.junit.opcodes.ireturn.jm.T_ireturn_8;
-import dxc.junit.opcodes.ireturn.jm.T_ireturn_9;
-
-public class Test_ireturn extends DxTestCase {
-
-    /**
-     * @title  simple
-     */
-    public void testN1() {
-        T_ireturn_1 t = new T_ireturn_1();
-        assertEquals(123456, t.run());
-    }
-
-    /**
-     * @title  check that frames are discarded and reinstananted correctly
-     */
-    public void testN2() {
-        T_ireturn_6 t = new T_ireturn_6();
-        assertEquals(123456, t.run());
-    }
-
-    /**
-     * @title  check that monitor is released by ireturn
-     */
-    public void testN3() {
-        assertTrue(T_ireturn_7.execute());
-    }
-
-    /**
-     * @title  Method is synchronized but thread is not monitor owner
-     */
-    public void testE1() {
-        T_ireturn_8 t = new T_ireturn_8();
-        try {
-            assertTrue(t.run());
-            fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Lock structural rule 1 is violated
-     */
-    public void testE2() {
-        T_ireturn_9 t = new T_ireturn_9();
-        try {
-            assertEquals(1, t.run());
-            // the JVM spec says that it is optional to implement the structural
-            // lock rules, see JVM spec 8.13 and monitorenter/exit opcodes.
-            System.out.print("dvmvfe:");
-            //fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - void
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ireturn.jm.T_ireturn_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ireturn.jm.T_ireturn_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ireturn.jm.T_ireturn_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ireturn.jm.T_ireturn_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ireturn.jm.T_ireturn_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.ireturn.jm.T_ireturn_11");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_1.j
deleted file mode 100644
index 8ba1daf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_1.j
+++ /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_ireturn_1.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    ldc 123456
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_1.java
deleted file mode 100644
index fe00032..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_1 {
-
-    public int run() {
-        return 123456;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_10.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_10.j
deleted file mode 100644
index f8779af..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_10.j
+++ /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_ireturn_10.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_10
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private static test()I
-    .limit stack 1
-    .limit locals 0
-
-    iconst_1
-    ireturn
-.end method
-
-
-
-.method public run()I
-    .limit stack 0
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/ireturn/jm/T_ireturn_10/test()I
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_10.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_10.java
deleted file mode 100644
index 929c22a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_10.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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_10 {
-    
-    private static int test() {
-        return 1;
-    }
-    
-    public int run() {
-        return test();
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_11.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_11.j
deleted file mode 100644
index fa54cc5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_11.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ireturn_11.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_11.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_11.java
deleted file mode 100644
index a58a6ba..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_11 {
-    
-    public int run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_2.j
deleted file mode 100644
index c5d10b0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_2.j
+++ /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_ireturn_2.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_2.java
deleted file mode 100644
index 074dfd8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_2 {
-
-    public int run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_3.j
deleted file mode 100644
index 7afc97d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_3.j
+++ /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_ireturn_3.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()D
-    .limit stack 1
-    .limit locals 1
-
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_3.java
deleted file mode 100644
index dba74ee..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_3 {
-
-    public int run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_4.j
deleted file mode 100644
index 961ad40..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_4.j
+++ /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_ireturn_4.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    ;iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_4.java
deleted file mode 100644
index 9b0b1bc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_4 {
-
-    public int run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_5.j
deleted file mode 100644
index dbd1ac5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_5.j
+++ /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_ireturn_5.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 2
-    .limit locals 1
-
-    dconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_5.java
deleted file mode 100644
index bdeba53..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_5 {
-
-    public int run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_6.j
deleted file mode 100644
index 3ed78c7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_6.j
+++ /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_ireturn_6.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit locals 6
-    .limit stack 6
-    
-    iconst_1
-    istore_1
-    iconst_2
-    istore_2
-    iconst_3
-    istore 3
-    
-    iconst_4
-    
-    invokestatic dxc/junit/opcodes/ireturn/jm/T_ireturn_6/test()I
-    
-    ldc 0xcafe
-    if_icmpne Label1
-    
-    iconst_4
-    if_icmpne Label0
-    
-    iload_1
-    iconst_1
-    if_icmpne Label0
-    
-    iload_2
-    iconst_2
-    if_icmpne Label0
-    
-    iload_3
-    iconst_3
-    if_icmpne Label0    
-    
-    ldc 123456
-    ireturn
-
-Label1:
-    pop
-Label0:
-    iconst_0
-    ireturn
-
-.end method
-
-.method private static test()I
-    .limit locals 4
-    .limit stack 4
-    
-    ldc 0xaaa
-    istore_1
-    ldc 0xbbbb
-    istore_2
-    ldc 0xcccc
-    istore_3
-    
-    ldc 0xdddd
-    
-    ldc 0xcafe
-    ireturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_6.java
deleted file mode 100644
index dbf7438..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_6 {
-
-    public int run() {
-        return 123456;
-    }
-    
-    private static int test() {
-        int a = 0xaaaa;
-        int b = 0xbbbb;
-        int c = 0xcccc;
-        return 0xcafe;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_7.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_7.j
deleted file mode 100644
index d1b7909..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_7.j
+++ /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.
-
-.source T_ireturn_7.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_7
-.super java/lang/Object
-.implements java/lang/Runnable
-
-.field  value I
-.field  failed Z
-
-.method public <init>()V
-    .limit stack 3
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.ireturn.jm.T_ireturn_7.value I
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.ireturn.jm.T_ireturn_7.failed Z
-
-    return
-
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-   
-    iconst_0
-    istore_1
-
-Label4:
-    iload_1
-    sipush 1000
-    if_icmpge Label3
-
-    aload_0
-    invokespecial dxc/junit/opcodes/ireturn/jm/T_ireturn_7/test()I
-    pop
-
-    iinc 1 1
-
-    goto Label4
-
-
-Label3:
-    return
-
-.end method
-
-
-
-.method private synchronized test()I
-    .limit stack 3
-    .limit locals 2
-    
-.line 16
-    aload_0
-    dup
-    getfield dxc.junit.opcodes.ireturn.jm.T_ireturn_7.value I
-    dup
-    istore_1
-
-    iconst_1
-    iadd
-    putfield dxc.junit.opcodes.ireturn.jm.T_ireturn_7.value I
-
-    iinc 1 1
-
-    invokestatic java/lang/Thread/yield()V
-
-    iload_1
-    aload_0
-    getfield dxc.junit.opcodes.ireturn.jm.T_ireturn_7.value I
-    if_icmpeq Label0
-
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.ireturn.jm.T_ireturn_7.failed Z
-
-Label0:
-    iload_1
-    ireturn
-.end method
-
-
-
-.method public static execute()Z
-    .limit stack 3
-    .limit locals 4
-
-    new dxc/junit/opcodes/ireturn/jm/T_ireturn_7
-    dup
-    invokespecial dxc/junit/opcodes/ireturn/jm/T_ireturn_7/<init>()V
-    astore_0
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_1
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_2
-
-    aload_1
-    invokevirtual java/lang/Thread/start()V
-
-    aload_2
-    invokevirtual java/lang/Thread/start()V
-
-Label12:
-    ldc2_w 5000
-    invokestatic java/lang/Thread/sleep(J)V
-
-Label13:
-    goto Label0
-
-Label14:            ; exception handler
-    astore_3
-    goto Label3
-
-Label0:
-    aload_0
-    getfield dxc.junit.opcodes.ireturn.jm.T_ireturn_7.value I
-    sipush 2000
-    if_icmpne Label3
-
-    aload_0
-    getfield dxc.junit.opcodes.ireturn.jm.T_ireturn_7.failed Z
-    ifne Label3
-
-    iconst_1
-    ireturn
-
-Label3:
-    iconst_0
-    ireturn
-
-.catch java/lang/InterruptedException from Label12 to Label13 using Label14
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_7.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_7.java
deleted file mode 100644
index 3505f19..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_7.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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_7 implements Runnable {
-    public final static int CNT = 1000;
-    int value = 0;
-    boolean failed = false;
-    
-    public void run() {
-        for(int i = 0; i < CNT; i++) {
-            test();
-        }
-    }
-    
-    private synchronized int test()    {
-        value++;
-        int c = value;
-        Thread.yield();
-        if(c != value)
-            failed = true;
-        return c;
-    }
-    
-    public static boolean execute() {
-        T_ireturn_7 test = new T_ireturn_7();
-        Thread t1 = new Thread(test);
-        Thread t2 = new Thread(test);
-        
-        t1.start();
-        t2.start();
-        
-        try
-        {
-            Thread.sleep(5000);
-        }
-        catch(InterruptedException ie) {
-            return false;
-        }
-        
-        if(test.value != CNT * 2)
-            return false;
-        return !test.failed;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_8.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_8.j
deleted file mode 100644
index ad9d528..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_8.j
+++ /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_ireturn_8.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private synchronized test()I
-    .limit stack 1
-    aload_0
-    monitorexit
-    iconst_0
-    ireturn
-.end method
-
-
-
-.method public run()Z
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial dxc/junit/opcodes/ireturn/jm/T_ireturn_8/test()I
-    pop
-
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_8.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_8.java
deleted file mode 100644
index 9ed48af..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_8.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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_8 {
-    
-    private synchronized int test() {
-        return 0;
-    }
-    
-    public boolean run() {
-        test();
-        return true;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_9.j b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_9.j
deleted file mode 100644
index 42230f3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ireturn_9.java
-.class public dxc/junit/opcodes/ireturn/jm/T_ireturn_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    monitorenter
-
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_9.java b/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_9.java
deleted file mode 100644
index 50bc299..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ireturn/jm/T_ireturn_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 dxc.junit.opcodes.ireturn.jm;
-
-public class T_ireturn_9 {
-    
-    public int run() {
-        return 1;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/Test_ishl.java b/tools/dx-tests/src/dxc/junit/opcodes/ishl/Test_ishl.java
deleted file mode 100644
index b433c89..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/Test_ishl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.ishl;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ishl.jm.T_ishl_1;
-
-public class Test_ishl extends DxTestCase {
-
-    /**
-     * @title  15 << 1
-     */
-    public void testN1() {
-        T_ishl_1 t = new T_ishl_1();
-        assertEquals(30, t.run(15, 1));
-    }
-
-    /**
-     * @title  33 << 2
-     */
-    public void testN2() {
-        T_ishl_1 t = new T_ishl_1();
-        assertEquals(132, t.run(33, 2));
-    }
-
-    /**
-     * @title  -15 << 1
-     */
-    public void testN3() {
-        T_ishl_1 t = new T_ishl_1();
-        assertEquals(-30, t.run(-15, 1));
-    }
-
-    /**
-     * @title  Arguments = 1 & -1
-     */
-    public void testN4() {
-        T_ishl_1 t = new T_ishl_1();
-        assertEquals(0x80000000, t.run(1, -1));
-    }
-
-    /**
-     * @title  Verify that shift distance is actually in range 0 to 32.
-     */
-    public void testN5() {
-        T_ishl_1 t = new T_ishl_1();
-        assertEquals(66, t.run(33, 33));
-    }
-
-    /**
-     * FIXME: do we need to check that all the shift distances (0..31) works
-     * fine?
-     */
-
-    /**
-     * @title  Arguments = 0 & -1
-     */
-    public void testB1() {
-        T_ishl_1 t = new T_ishl_1();
-        assertEquals(0, t.run(0, -1));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE & 1
-     */
-    public void testB2() {
-        T_ishl_1 t = new T_ishl_1();
-        assertEquals(0xfffffffe, t.run(Integer.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE & 1
-     */
-    public void testB3() {
-        T_ishl_1 t = new T_ishl_1();
-        assertEquals(0, t.run(Integer.MIN_VALUE, 1));
-    }
-
-    /**
-     * @title  Arguments = 1 & 0
-     */
-    public void testB4() {
-        T_ishl_1 t = new T_ishl_1();
-        assertEquals(1, t.run(1, 0));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ishl.jm.T_ishl_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ishl.jm.T_ishl_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long & int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ishl.jm.T_ishl_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference & int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ishl.jm.T_ishl_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_1.j
deleted file mode 100644
index a703b28..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ishl_1.java
-.class public dxc/junit/opcodes/ishl/jm/T_ishl_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    ishl
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_1.java
deleted file mode 100644
index 179d4f8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_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 dxc.junit.opcodes.ishl.jm;
-
-public class T_ishl_1 {
-
-    public int run(int a, int b) {
-        return a << b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_2.j
deleted file mode 100644
index 015f57f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ishl_2.java
-.class public dxc/junit/opcodes/ishl/jm/T_ishl_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-;    iload_2
-    ishl
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_2.java
deleted file mode 100644
index 94479b4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_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 dxc.junit.opcodes.ishl.jm;
-
-public class T_ishl_2 {
-
-    public int run(int a, int b) {
-        return a << b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_3.j
deleted file mode 100644
index d1a4f05..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_3.j
+++ /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_ishl_3.java
-.class public dxc/junit/opcodes/ishl/jm/T_ishl_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DI)I
-    .limit stack 3
-    .limit locals 4
-
-    dload_1
-;    d2i
-    iload_3
-    ishl
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_3.java
deleted file mode 100644
index e29bdcb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_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 dxc.junit.opcodes.ishl.jm;
-
-public class T_ishl_3 {
-
-    public int run(double a, int b) {
-        return (int)a << b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_4.j
deleted file mode 100644
index bf5cfb7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_4.j
+++ /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_ishl_4.java
-.class public dxc/junit/opcodes/ishl/jm/T_ishl_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(IJ)I
-    .limit stack 3
-    .limit locals 4
-
-    iload_1
-    lload_2
-;    l2i
-    ishl
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_4.java
deleted file mode 100644
index ea7a5ff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_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 dxc.junit.opcodes.ishl.jm;
-
-public class T_ishl_4 {
-
-    public int run(int a, long b) {
-        return a << (int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_5.j
deleted file mode 100644
index f5af8bd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ishl_5.java
-.class public dxc/junit/opcodes/ishl/jm/T_ishl_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    ishl
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_5.java
deleted file mode 100644
index 6db63ce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishl/jm/T_ishl_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 dxc.junit.opcodes.ishl.jm;
-
-public class T_ishl_5 {
-
-    public int run(int a, int b) {
-        return a << b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/Test_ishr.java b/tools/dx-tests/src/dxc/junit/opcodes/ishr/Test_ishr.java
deleted file mode 100644
index eaed21c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/Test_ishr.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 dxc.junit.opcodes.ishr;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ishr.jm.T_ishr_1;
-
-public class Test_ishr extends DxTestCase {
-
-    /**
-     * @title  15 >> 1
-     */
-    public void testN1() {
-        T_ishr_1 t = new T_ishr_1();
-        assertEquals(7, t.run(15, 1));
-    }
-
-    /**
-     * @title  33 >> 2
-     */
-    public void testN2() {
-        T_ishr_1 t = new T_ishr_1();
-        assertEquals(8, t.run(33, 2));
-    }
-
-    /**
-     * @title  -15 >> 1
-     */
-    public void testN3() {
-        T_ishr_1 t = new T_ishr_1();
-        assertEquals(-8, t.run(-15, 1));
-    }
-
-    /**
-     * @title  Arguments = 1 & -1
-     */
-    public void testN4() {
-        T_ishr_1 t = new T_ishr_1();
-        assertEquals(0, t.run(1, -1));
-    }
-
-    /**
-     * @title  Verify that shift distance is actually in range 0 to 32.
-     */
-    public void testN5() {
-        T_ishr_1 t = new T_ishr_1();
-        assertEquals(16, t.run(33, 33));
-    }
-
-    /**
-     * @title  Arguments = 0 & -1
-     */
-    public void testB1() {
-        T_ishr_1 t = new T_ishr_1();
-        assertEquals(0, t.run(0, -1));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE & 1
-     */
-    public void testB2() {
-        T_ishr_1 t = new T_ishr_1();
-        assertEquals(0x3FFFFFFF, t.run(Integer.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE & 1
-     */
-    public void testB3() {
-        T_ishr_1 t = new T_ishr_1();
-        assertEquals(0xc0000000, t.run(Integer.MIN_VALUE, 1));
-    }
-
-    /**
-     * @title  Arguments = 1 & 0
-     */
-    public void testB4() {
-        T_ishr_1 t = new T_ishr_1();
-        assertEquals(1, t.run(1, 0));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ishr.jm.T_ishr_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ishr.jm.T_ishr_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long & int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ishr.jm.T_ishr_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference & int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ishr.jm.T_ishr_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_1.j
deleted file mode 100644
index 227936c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ishr_1.java
-.class public dxc/junit/opcodes/ishr/jm/T_ishr_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    ishr
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_1.java
deleted file mode 100644
index 388f28d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_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 dxc.junit.opcodes.ishr.jm;
-
-public class T_ishr_1 {
-
-    public int run(int a, int b) {
-        return a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_2.j
deleted file mode 100644
index 21e352f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ishr_2.java
-.class public dxc/junit/opcodes/ishr/jm/T_ishr_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-;    iload_2
-    ishr
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_2.java
deleted file mode 100644
index 4e5a4aa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_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 dxc.junit.opcodes.ishr.jm;
-
-public class T_ishr_2 {
-
-    public int run(int a, int b) {
-        return a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_3.j
deleted file mode 100644
index 26d6bd5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_3.j
+++ /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_ishr_3.java
-.class public dxc/junit/opcodes/ishr/jm/T_ishr_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DI)I
-    .limit stack 3
-    .limit locals 4
-
-    dload_1
-;    d2i
-    iload_3
-    ishr
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_3.java
deleted file mode 100644
index bee515f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_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 dxc.junit.opcodes.ishr.jm;
-
-public class T_ishr_3 {
-
-    public int run(double a, int b) {
-        return (int)a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_4.j
deleted file mode 100644
index 78f5c70..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_4.j
+++ /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_ishr_4.java
-.class public dxc/junit/opcodes/ishr/jm/T_ishr_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(IJ)I
-    .limit stack 3
-    .limit locals 4
-
-    iload_1
-    lload_2
-;    l2i
-    ishr
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_4.java
deleted file mode 100644
index c8c90be..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_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 dxc.junit.opcodes.ishr.jm;
-
-public class T_ishr_4 {
-
-    public int run(int a, long b) {
-        return a >> (int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_5.j
deleted file mode 100644
index 8abb1ae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ishr_5.java
-.class public dxc/junit/opcodes/ishr/jm/T_ishr_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    ishr
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_5.java
deleted file mode 100644
index 158f740..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ishr/jm/T_ishr_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 dxc.junit.opcodes.ishr.jm;
-
-public class T_ishr_5 {
-    
-    public int run(int a, int b) {
-        return a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/Test_istore.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/Test_istore.java
deleted file mode 100644
index 0bf0a72..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/Test_istore.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.istore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.istore.jm.T_istore_1;
-import dxc.junit.opcodes.istore.jm.T_istore_1_w;
-import dxc.junit.opcodes.istore.jm.T_istore_5;
-import dxc.junit.opcodes.istore.jm.T_istore_5_w;
-
-public class Test_istore extends DxTestCase {
-
-    /*
-     * NORMAL ISTORE VERSION
-     */
-
-    /**
-     * @title  istore 0
-     */
-    public void testN1() {
-        assertEquals(3, T_istore_1.run());
-    }
-
-    /**
-     * @title  istore 255
-     */
-    public void testN2() {
-        assertEquals(3, T_istore_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore.jm.T_istore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore.jm.T_istore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore.jm.T_istore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE ISTORE VERSION
-     */
-
-    /**
-     * @title  istore_w 0
-     */
-    public void testN3() {
-        assertEquals(3, T_istore_1_w.run());
-    }
-
-    /**
-     * @title  istore 257
-     */
-    public void testN4() {
-        assertEquals(3, T_istore_5_w.run());
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore.jm.T_istore_2_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore.jm.T_istore_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore.jm.T_istore_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1.j
deleted file mode 100644
index 2b56c03..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_1.java
-.class public dxc/junit/opcodes/istore/jm/T_istore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 1
-    
-    iconst_3
-    istore 0
-    iconst_4
-    iload 0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1.java
deleted file mode 100644
index 26bb424..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_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 dxc.junit.opcodes.istore.jm;
-
-public class T_istore_1 {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1_w.j
deleted file mode 100644
index fd4e415..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_1_w.java
-.class public dxc/junit/opcodes/istore/jm/T_istore_1_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 1
-    
-    iconst_3
-    istore_w 0
-    iconst_4
-    iload 0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1_w.java
deleted file mode 100644
index 4de9c68..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_1_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.istore.jm;
-
-public class T_istore_1_w {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2.j
deleted file mode 100644
index c84ab6f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_2.java
-.class public dxc/junit/opcodes/istore/jm/T_istore_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    istore 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2.java
deleted file mode 100644
index 7c31a2f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_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 dxc.junit.opcodes.istore.jm;
-
-public class T_istore_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2_w.j
deleted file mode 100644
index 4366807..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_2_w.java
-.class public dxc/junit/opcodes/istore/jm/T_istore_2_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    istore_w 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2_w.java
deleted file mode 100644
index eea683b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_2_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.istore.jm;
-
-public class T_istore_2_w {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3.j
deleted file mode 100644
index d7bd3b6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_3.java
-.class public dxc/junit/opcodes/istore/jm/T_istore_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    istore 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3.java
deleted file mode 100644
index 094c6c6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3.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 dxc.junit.opcodes.istore.jm;
-
-public class T_istore_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3_w.j
deleted file mode 100644
index dfac893..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_3_w.java
-.class public dxc/junit/opcodes/istore/jm/T_istore_3_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    istore_w 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3_w.java
deleted file mode 100644
index 9b2f312..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_3_w.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 dxc.junit.opcodes.istore.jm;
-
-public class T_istore_3_w {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4.j
deleted file mode 100644
index 6252b44..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_4.java
-.class public dxc/junit/opcodes/istore/jm/T_istore_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    istore 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4.java
deleted file mode 100644
index c7882a3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_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 dxc.junit.opcodes.istore.jm;
-
-public class T_istore_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4_w.j
deleted file mode 100644
index 7050afa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_4_w.java
-.class public dxc/junit/opcodes/istore/jm/T_istore_4_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    istore_w 0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4_w.java
deleted file mode 100644
index 79d0d0a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_4_w.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 dxc.junit.opcodes.istore.jm;
-
-public class T_istore_4_w {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5.j
deleted file mode 100644
index 41e7c1f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_5.java
-.class public dxc/junit/opcodes/istore/jm/T_istore_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 300
-    
-    iconst_3
-    istore 255
-    iconst_4
-    iload 255
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5.java
deleted file mode 100644
index 51761df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_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 dxc.junit.opcodes.istore.jm;
-
-public class T_istore_5 {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5_w.j
deleted file mode 100644
index 79ddbac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_5_w.java
-.class public dxc/junit/opcodes/istore/jm/T_istore_5_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 300
-    
-    iconst_3
-    istore_w 257
-    iconst_4
-    iload 257
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5_w.java
deleted file mode 100644
index 456e1c6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore/jm/T_istore_5_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.istore.jm;
-
-public class T_istore_5_w {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/Test_istore_0.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/Test_istore_0.java
deleted file mode 100644
index 5db3ee1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/Test_istore_0.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.istore_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.istore_0.jm.T_istore_0_1;
-import dxc.junit.opcodes.istore_0.jm.T_istore_0_5;
-
-public class Test_istore_0 extends DxTestCase {
-
-    /**
-     * @title 
-     * "The value of local variable at <n> is pushed onto the operand stack."
-     */
-    public void testN1() {
-        assertEquals(3, T_istore_0_1.run());
-    }
-
-    /**
-     * @title 
-     * "Each of the istore_<n> instructions is the same as istore with an index of <n>"
-     */
-    public void testN2() {
-        assertTrue(T_istore_0_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_0.jm.T_istore_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_0.jm.T_istore_0_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_0.jm.T_istore_0_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_1.j
deleted file mode 100644
index 018b594..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_0_1.java
-.class public dxc/junit/opcodes/istore_0/jm/T_istore_0_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 1
-    
-    iconst_3
-    istore_0
-    iconst_4
-    iload_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_1.java
deleted file mode 100644
index 1674efd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_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 dxc.junit.opcodes.istore_0.jm;
-
-public class T_istore_0_1 {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_2.j
deleted file mode 100644
index 72a9b7e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_0_2.java
-.class public dxc/junit/opcodes/istore_0/jm/T_istore_0_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    istore_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_2.java
deleted file mode 100644
index 072ea72..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_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 dxc.junit.opcodes.istore_0.jm;
-
-public class T_istore_0_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_3.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_3.j
deleted file mode 100644
index 8e48f0c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_0_3.java
-.class public dxc/junit/opcodes/istore_0/jm/T_istore_0_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    istore_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_3.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_3.java
deleted file mode 100644
index 7b4b791..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_3.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 dxc.junit.opcodes.istore_0.jm;
-
-public class T_istore_0_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_4.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_4.j
deleted file mode 100644
index 97a9b31..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_0_4.java
-.class public dxc/junit/opcodes/istore_0/jm/T_istore_0_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    istore_0
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_4.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_4.java
deleted file mode 100644
index afe4463..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_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 dxc.junit.opcodes.istore_0.jm;
-
-public class T_istore_0_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_5.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_5.j
deleted file mode 100644
index 2d44529..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_5.j
+++ /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_istore_0_5.java
-.class public dxc/junit/opcodes/istore_0/jm/T_istore_0_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 2
-
-    iconst_4
-    istore_0
-    iload_0
-
-    iconst_4
-    istore 0
-    iload_0
-    
-    if_icmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_5.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_5.java
deleted file mode 100644
index f1de781..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_0/jm/T_istore_0_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 dxc.junit.opcodes.istore_0.jm;
-
-public class T_istore_0_5 {
-
-    public static boolean run() {
-        int i = 4;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/Test_istore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/Test_istore_1.java
deleted file mode 100644
index f19e001..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/Test_istore_1.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.istore_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.istore_1.jm.T_istore_1_1;
-import dxc.junit.opcodes.istore_1.jm.T_istore_1_5;
-
-public class Test_istore_1 extends DxTestCase {
-
-    /**
-     * @title value of local variable at <n> is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(3, T_istore_1_1.run());
-    }
-
-    /**
-     * @title each of the istore_<n> instructions is the same as istore with an index of <n>
-     */
-    public void testN2() {
-        assertTrue(T_istore_1_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_1.jm.T_istore_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_1.jm.T_istore_1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_1.jm.T_istore_1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_1.j
deleted file mode 100644
index 19950d5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_1_1.java
-.class public dxc/junit/opcodes/istore_1/jm/T_istore_1_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 2
-    
-    iconst_3
-    istore_1
-    iconst_4
-    iload_1
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_1.java
deleted file mode 100644
index 862a5ee..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_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 dxc.junit.opcodes.istore_1.jm;
-
-public class T_istore_1_1 {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_2.j
deleted file mode 100644
index 5e4ba56..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_1_2.java
-.class public dxc/junit/opcodes/istore_1/jm/T_istore_1_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    istore_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_2.java
deleted file mode 100644
index 914e29a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_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 dxc.junit.opcodes.istore_1.jm;
-
-public class T_istore_1_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_3.j
deleted file mode 100644
index 46c9882..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_1_3.java
-.class public dxc/junit/opcodes/istore_1/jm/T_istore_1_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    istore_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_3.java
deleted file mode 100644
index 4e6c906..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_3.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 dxc.junit.opcodes.istore_1.jm;
-
-public class T_istore_1_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_4.j
deleted file mode 100644
index f5d9dd6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_1_4.java
-.class public dxc/junit/opcodes/istore_1/jm/T_istore_1_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    istore_1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_4.java
deleted file mode 100644
index ef863a0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_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 dxc.junit.opcodes.istore_1.jm;
-
-public class T_istore_1_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_5.j
deleted file mode 100644
index 2f36d55..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_5.j
+++ /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_istore_1_5.java
-.class public dxc/junit/opcodes/istore_1/jm/T_istore_1_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 2
-
-    iconst_4
-    istore_1
-    iload_1
-
-    iconst_4
-    istore 1
-    iload_1
-    
-    if_icmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_5.java
deleted file mode 100644
index 1169514..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_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 dxc.junit.opcodes.istore_1.jm;
-
-public class T_istore_1_5 {
-
-    public static boolean run() {
-        int i = 4;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_6.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_6.java
deleted file mode 100644
index 91d705a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_1/jm/T_istore_1_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 dxc.junit.opcodes.istore_1.jm;
-
-public class T_istore_1_6 {
-
-    public static boolean run() {
-        int i = 4;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/Test_istore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/Test_istore_2.java
deleted file mode 100644
index 5969a29..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/Test_istore_2.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.istore_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.istore_2.jm.T_istore_2_1;
-import dxc.junit.opcodes.istore_2.jm.T_istore_2_5;
-
-public class Test_istore_2 extends DxTestCase {
-
-    /**
-     * @title value of local variable at <n> is pushed onto the operand stack.
-     */
-    public void testN1() {
-        assertEquals(3, T_istore_2_1.run());
-    }
-
-    /**
-     * @title Each of the istore_<n> instructions is the same as istore with an index of <n>
-     */
-    public void testN2() {
-        assertTrue(T_istore_2_5.run());
-    }
-
-    /**
-     * /** @constraint 4.8.1.22
-     * @title index must be no greater than the
-     * value of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_2.jm.T_istore_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_2.jm.T_istore_2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_2.jm.T_istore_2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_1.j
deleted file mode 100644
index 08ecc36..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_2_1.java
-.class public dxc/junit/opcodes/istore_2/jm/T_istore_2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 4
-    
-    iconst_3
-    istore_2
-    iconst_4
-    iload_2
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_1.java
deleted file mode 100644
index ee46237..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_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 dxc.junit.opcodes.istore_2.jm;
-
-public class T_istore_2_1 {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_2.j
deleted file mode 100644
index a87b68b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_2_2.java
-.class public dxc/junit/opcodes/istore_2/jm/T_istore_2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    istore_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_2.java
deleted file mode 100644
index 0bd11f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_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 dxc.junit.opcodes.istore_2.jm;
-
-public class T_istore_2_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_3.j
deleted file mode 100644
index c3a6c6f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_2_3.java
-.class public dxc/junit/opcodes/istore_2/jm/T_istore_2_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    istore_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_3.java
deleted file mode 100644
index 7b1052c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_3.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 dxc.junit.opcodes.istore_2.jm;
-
-public class T_istore_2_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_4.j
deleted file mode 100644
index e78662a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_2_4.java
-.class public dxc/junit/opcodes/istore_2/jm/T_istore_2_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    istore_2
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_4.java
deleted file mode 100644
index ef0a44b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_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 dxc.junit.opcodes.istore_2.jm;
-
-public class T_istore_2_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_5.j
deleted file mode 100644
index 65212ec..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_5.j
+++ /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_istore_2_5.java
-.class public dxc/junit/opcodes/istore_2/jm/T_istore_2_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 3
-
-    iconst_4
-    istore_2
-    iload_2
-
-    iconst_4
-    istore 2
-    iload_2
-    
-    if_icmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_5.java
deleted file mode 100644
index 3d852d3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_2/jm/T_istore_2_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 dxc.junit.opcodes.istore_2.jm;
-
-public class T_istore_2_5 {
-
-    public static boolean run() {
-        int i = 4;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/Test_istore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/Test_istore_3.java
deleted file mode 100644
index 3935338..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/Test_istore_3.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.istore_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.istore_3.jm.T_istore_3_1;
-import dxc.junit.opcodes.istore_3.jm.T_istore_3_5;
-
-public class Test_istore_3 extends DxTestCase {
-
-    /**
-     * @title value of local variable at <n> is pushed onto the operand stack.
-     */
-    public void testN1() {
-        assertEquals(3, T_istore_3_1.run());
-    }
-
-    /**
-     * @title Each of the istore_<n> instructions is the same as istore with an index of <n>
-     */
-    public void testN2() {
-        assertTrue(T_istore_3_5.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_3.jm.T_istore_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_3.jm.T_istore_3_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.istore_3.jm.T_istore_3_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_1.j
deleted file mode 100644
index 4500a87..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_3_1.java
-.class public dxc/junit/opcodes/istore_3/jm/T_istore_3_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 4
-    
-    iconst_3
-    istore_3
-    iconst_4
-    iload_3
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_1.java
deleted file mode 100644
index 6e26dac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_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 dxc.junit.opcodes.istore_3.jm;
-
-public class T_istore_3_1 {
-
-    public static int run() {
-        return 3;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_2.j
deleted file mode 100644
index 0be8ae9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_3_2.java
-.class public dxc/junit/opcodes/istore_3/jm/T_istore_3_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    istore_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_2.java
deleted file mode 100644
index cd6cc2e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_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 dxc.junit.opcodes.istore_3.jm;
-
-public class T_istore_3_2 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_3.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_3.j
deleted file mode 100644
index e481f78..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_3_3.java
-.class public dxc/junit/opcodes/istore_3/jm/T_istore_3_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    istore_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_3.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_3.java
deleted file mode 100644
index b51534a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_3.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 dxc.junit.opcodes.istore_3.jm;
-
-public class T_istore_3_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_4.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_4.j
deleted file mode 100644
index 0c6e947..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_istore_3_4.java
-.class public dxc/junit/opcodes/istore_3/jm/T_istore_3_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    lconst_1
-    istore_3
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_4.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_4.java
deleted file mode 100644
index 9eebda6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_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 dxc.junit.opcodes.istore_3.jm;
-
-public class T_istore_3_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_5.j b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_5.j
deleted file mode 100644
index 6a10077..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_5.j
+++ /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_istore_3_5.java
-.class public dxc/junit/opcodes/istore_3/jm/T_istore_3_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public static run()Z
-    .limit stack 2
-    .limit locals 4
-
-    iconst_4
-    istore_3
-    iload_3
-
-    iconst_4
-    istore 3
-    iload_3
-    
-    if_icmpne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_5.java b/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_5.java
deleted file mode 100644
index dc6c7ef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/istore_3/jm/T_istore_3_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 dxc.junit.opcodes.istore_3.jm;
-
-public class T_istore_3_5 {
-
-    public static boolean run() {
-        int i = 4;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/Test_isub.java b/tools/dx-tests/src/dxc/junit/opcodes/isub/Test_isub.java
deleted file mode 100644
index a31f856..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/Test_isub.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.isub;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.isub.jm.T_isub_1;
-
-public class Test_isub extends DxTestCase {
-
-    /**
-     * @title Arguments = 8, 4
-     */
-    public void testN1() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(4, t.run(8, 4));
-    }
-
-    /**
-     * @title Arguments = 0, 255
-     */
-    public void testN2() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(-255, t.run(0, 255));
-    }
-
-    /**
-     * @title Arguments = 0, -65536
-     */
-    public void testN3() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(65536, t.run(0, -65536));
-    }
-
-    /**
-     * @title Arguments = 0, -2147483647
-     */
-    public void testN4() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(Integer.MAX_VALUE, t.run(0, -2147483647));
-    }
-
-    /**
-     * @title Arguments = 0, Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(-2147483647, t.run(0, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title Arguments = Integer.MAX_VALUE, Integer.MAX_VALUE
-     */
-    public void testB2() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(0, t.run(Integer.MAX_VALUE, Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title Arguments = Integer.MAX_VALUE, -1
-     */
-    public void testB3() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(Integer.MIN_VALUE, t.run(Integer.MAX_VALUE, -1));
-    }
-
-    /**
-     * @title Arguments = Integer.MIN_VALUE, 1
-     */
-    public void testB4() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(Integer.MAX_VALUE, t.run(Integer.MIN_VALUE, 1));
-    }
-
-    /**
-     * @title Arguments = 0, 0
-     */
-    public void testB5() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(0, t.run(0, 0));
-    }
-
-    /**
-     * @title Arguments = 0, -Integer.MIN_VALUE
-     */
-    public void testB6() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(-2147483648, t.run(0, -Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title Arguments = Integer.MAX_VALUE, 1
-     */
-    public void testB7() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(2147483646, t.run(Integer.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title Arguments = 1, Integer.MIN_VALUE
-     */
-    public void testB8() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(-2147483647, t.run(1, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @title Arguments = Integer.MAX_VALUE, Integer.MIN_VALUE
-     */
-    public void testB9() {
-        T_isub_1 t = new T_isub_1();
-        assertEquals(-1, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.isub.jm.T_isub_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int / double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.isub.jm.T_isub_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.isub.jm.T_isub_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference / int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.isub.jm.T_isub_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_1.j b/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_1.j
deleted file mode 100644
index d406038..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_isub_1.java
-.class public dxc/junit/opcodes/isub/jm/T_isub_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    isub
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_1.java b/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_1.java
deleted file mode 100644
index bcb204e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_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 dxc.junit.opcodes.isub.jm;
-
-public class T_isub_1 {
-
-    public int run(int a, int b) {
-        return a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_2.j b/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_2.j
deleted file mode 100644
index d9c100a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_isub_2.java
-.class public dxc/junit/opcodes/isub/jm/T_isub_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    ; iload_2    
-    isub
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_2.java b/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_2.java
deleted file mode 100644
index b0c22d1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_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 dxc.junit.opcodes.isub.jm;
-
-public class T_isub_2 {
-
-    public int run(int a, int b) {
-        return a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_3.j b/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_3.j
deleted file mode 100644
index e8afde9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_isub_3.java
-.class public dxc/junit/opcodes/isub/jm/T_isub_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(ID)I
-    .limit stack 3
-    .limit locals 5
-    iload_1
-    dload_2    
-    isub
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_3.java b/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_3.java
deleted file mode 100644
index 0bfd571..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_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 dxc.junit.opcodes.isub.jm;
-
-public class T_isub_3 {
-
-    public int run(int a, double b) {
-        return a-(int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_4.j b/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_4.j
deleted file mode 100644
index 93d9f1d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_4.j
+++ /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_isub_4.java
-.class public dxc/junit/opcodes/isub/jm/T_isub_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JI)I
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-;    l2i
-    iload_3
-    isub
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_4.java b/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_4.java
deleted file mode 100644
index 66b9274..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_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 dxc.junit.opcodes.isub.jm;
-
-public class T_isub_4 {
-
-    public int run(long a, int b) {
-        return (int)a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_5.j b/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_5.j
deleted file mode 100644
index 3ec22ff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_isub_5.java
-.class public dxc/junit/opcodes/isub/jm/T_isub_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    isub
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_5.java b/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_5.java
deleted file mode 100644
index f7660cb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/isub/jm/T_isub_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 dxc.junit.opcodes.isub.jm;
-
-public class T_isub_5 {
-    
-    public int run(int a, int b) {
-        return a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/Test_iushr.java b/tools/dx-tests/src/dxc/junit/opcodes/iushr/Test_iushr.java
deleted file mode 100644
index 2f20baf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/Test_iushr.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 dxc.junit.opcodes.iushr;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.iushr.jm.T_iushr_1;
-
-public class Test_iushr extends DxTestCase {
-
-    /**
-     * @title  15 >> 1
-     */
-    public void testN1() {
-        T_iushr_1 t = new T_iushr_1();
-        assertEquals(7, t.run(15, 1));
-    }
-
-    /**
-     * @title  33 >> 2
-     */
-    public void testN2() {
-        T_iushr_1 t = new T_iushr_1();
-        assertEquals(8, t.run(33, 2));
-    }
-
-    /**
-     * @title  -15 >> 1
-     */
-    public void testN3() {
-        T_iushr_1 t = new T_iushr_1();
-        assertEquals(0x7FFFFFF8, t.run(-15, 1));
-    }
-
-    /**
-     * @title  Arguments = 1 & -1
-     */
-    public void testN4() {
-        T_iushr_1 t = new T_iushr_1();
-        assertEquals(0, t.run(1, -1));
-    }
-
-    /**
-     * @title  Verify that shift distance is actually in range 0 to 32.
-     */
-    public void testN5() {
-        T_iushr_1 t = new T_iushr_1();
-        assertEquals(16, t.run(33, 33));
-    }
-
-    /**
-     * @title  Arguments = 0 & -1
-     */
-    public void testB1() {
-        T_iushr_1 t = new T_iushr_1();
-        assertEquals(0, t.run(0, -1));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE & 1
-     */
-    public void testB2() {
-        T_iushr_1 t = new T_iushr_1();
-        assertEquals(0x3FFFFFFF, t.run(Integer.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title  Arguments = Integer.MIN_VALUE & 1
-     */
-    public void testB3() {
-        T_iushr_1 t = new T_iushr_1();
-        assertEquals(0x40000000, t.run(Integer.MIN_VALUE, 1));
-    }
-
-    /**
-     * @title  Arguments = 1 & 0
-     */
-    public void testB4() {
-        T_iushr_1 t = new T_iushr_1();
-        assertEquals(1, t.run(1, 0));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.iushr.jm.T_iushr_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.iushr.jm.T_iushr_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long & int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.iushr.jm.T_iushr_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference & int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.iushr.jm.T_iushr_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_1.j b/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_1.j
deleted file mode 100644
index d155b85..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iushr_1.java
-.class public dxc/junit/opcodes/iushr/jm/T_iushr_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    iushr
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_1.java b/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_1.java
deleted file mode 100644
index bef0499..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_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 dxc.junit.opcodes.iushr.jm;
-
-public class T_iushr_1 {
-
-    public int run(int a, int b) {
-        return a >>> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_2.j b/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_2.j
deleted file mode 100644
index 211cd49..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iushr_2.java
-.class public dxc/junit/opcodes/iushr/jm/T_iushr_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-;    iload_2
-    iushr
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_2.java b/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_2.java
deleted file mode 100644
index 951c9db..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_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 dxc.junit.opcodes.iushr.jm;
-
-public class T_iushr_2 {
-
-    public int run(int a, int b) {
-        return a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_3.j b/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_3.j
deleted file mode 100644
index 37f6b3c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_3.j
+++ /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_iushr_3.java
-.class public dxc/junit/opcodes/iushr/jm/T_iushr_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DI)I
-    .limit stack 3
-    .limit locals 4
-
-    dload_1
-;    d2i
-    iload_3
-    iushr
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_3.java b/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_3.java
deleted file mode 100644
index ede613c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_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 dxc.junit.opcodes.iushr.jm;
-
-public class T_iushr_3 {
-
-    public int run(double a, int b) {
-        return (int)a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_4.j b/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_4.j
deleted file mode 100644
index c6e4744..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_4.j
+++ /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_iushr_4.java
-.class public dxc/junit/opcodes/iushr/jm/T_iushr_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(IJ)I
-    .limit stack 3
-    .limit locals 4
-
-    iload_1
-    lload_2
-;    l2i
-    iushr
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_4.java b/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_4.java
deleted file mode 100644
index 41c7829..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_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 dxc.junit.opcodes.iushr.jm;
-
-public class T_iushr_4 {
-
-    public int run(int a, long b) {
-        return a >> (int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_5.j b/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_5.j
deleted file mode 100644
index 4e4ae33..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_iushr_5.java
-.class public dxc/junit/opcodes/iushr/jm/T_iushr_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    iushr
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_5.java b/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_5.java
deleted file mode 100644
index beb152c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/iushr/jm/T_iushr_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 dxc.junit.opcodes.iushr.jm;
-
-public class T_iushr_5 {
-    
-    public int run(int a, int b) {
-        return a >>> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/Test_ixor.java b/tools/dx-tests/src/dxc/junit/opcodes/ixor/Test_ixor.java
deleted file mode 100644
index 5425b9e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/Test_ixor.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 dxc.junit.opcodes.ixor;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ixor.jm.T_ixor_1;
-
-public class Test_ixor extends DxTestCase {
-
-    /**
-     * @title Arguments = 15, 8
-     */
-    public void testN1() {
-        T_ixor_1 t = new T_ixor_1();
-        assertEquals(7, t.run(15, 8));
-    }
-
-    /**
-     * @title Arguments = 0xfffffff8, 0xfffffff1
-     */
-    public void testN2() {
-        T_ixor_1 t = new T_ixor_1();
-        assertEquals(9, t.run(0xfffffff8, 0xfffffff1));
-    }
-
-    /**
-     * @title  Arguments = 0xcafe & -1
-     */
-    public void testN3() {
-        T_ixor_1 t = new T_ixor_1();
-        assertEquals(0xFFFF3501, t.run(0xcafe, -1));
-    }
-
-    /**
-     * @title  Arguments = 0 & -1
-     */
-    public void testB1() {
-        T_ixor_1 t = new T_ixor_1();
-        assertEquals(-1, t.run(0, -1));
-    }
-
-    /**
-     * @title  Arguments = Integer.MAX_VALUE & Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_ixor_1 t = new T_ixor_1();
-        assertEquals(0xffffffff, t.run(Integer.MAX_VALUE, Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ixor.jm.T_ixor_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ixor.jm.T_ixor_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long & int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ixor.jm.T_ixor_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference & int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ixor.jm.T_ixor_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_1.j
deleted file mode 100644
index 56ae3a0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ixor_1.java
-.class public dxc/junit/opcodes/ixor/jm/T_ixor_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    ixor
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_1.java
deleted file mode 100644
index c4ae6bb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_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 dxc.junit.opcodes.ixor.jm;
-
-public class T_ixor_1 {
-
-    public int run(int a, int b) {
-        return a ^ b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_2.j
deleted file mode 100644
index 5d80b38..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ixor_2.java
-.class public dxc/junit/opcodes/ixor/jm/T_ixor_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-;    iload_2
-    ixor
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_2.java
deleted file mode 100644
index 57fbb22..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_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 dxc.junit.opcodes.ixor.jm;
-
-public class T_ixor_2 {
-
-    public int run(int a, int b) {
-        return a ^ b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_3.j
deleted file mode 100644
index 5773388..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_3.j
+++ /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_ixor_3.java
-.class public dxc/junit/opcodes/ixor/jm/T_ixor_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DI)I
-    .limit stack 3
-    .limit locals 4
-
-    dload_1
-;    d2i
-    iload_3
-    ixor
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_3.java
deleted file mode 100644
index 8b968ed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_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 dxc.junit.opcodes.ixor.jm;
-
-public class T_ixor_3 {
-
-    public int run(double a, int b) {
-        return (int)a ^ b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_4.j
deleted file mode 100644
index 68649a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_4.j
+++ /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_ixor_4.java
-.class public dxc/junit/opcodes/ixor/jm/T_ixor_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(IJ)I
-    .limit stack 3
-    .limit locals 4
-
-    iload_1
-    lload_2
-;    l2i
-    ixor
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_4.java
deleted file mode 100644
index 6406bc9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_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 dxc.junit.opcodes.ixor.jm;
-
-public class T_ixor_4 {
-
-    public int run(int a, long b) {
-        return a ^ (int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_5.j
deleted file mode 100644
index 53c64f4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ixor_5.java
-.class public dxc/junit/opcodes/ixor/jm/T_ixor_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    iload_2
-    ixor
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_5.java
deleted file mode 100644
index 3b52886..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ixor/jm/T_ixor_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 dxc.junit.opcodes.ixor.jm;
-
-public class T_ixor_5 {
-    
-    public int run(int a, int b) {
-        return a ^ b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/Test_jsr.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr/Test_jsr.java
deleted file mode 100644
index 5a737a9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/Test_jsr.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 dxc.junit.opcodes.jsr;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.jsr.jm.T_jsr_1;
-import dxc.junit.opcodes.jsr.jm.T_jsr_2;
-
-public class Test_jsr extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_jsr_1 t = new T_jsr_1();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  nested jsrs
-     */
-    public void testN2() {
-        T_jsr_2 t = new T_jsr_2();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.23
-     * @title recursion of jsr
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.jsr.jm.T_jsr_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.jsr.jm.T_jsr_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target inside wide instruction
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.jsr.jm.T_jsr_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_1.j b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_1.j
deleted file mode 100644
index 5e97c77..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_1.j
+++ /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_jsr_1.java
-.class public dxc/junit/opcodes/jsr/jm/T_jsr_1
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    jsr SetField
-
-    aload_0
-    getfield dxc.junit.opcodes.jsr.jm.T_jsr_1.i1 I
-    sipush 1000
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_1
-    aload_0
-    sipush 1000
-    putfield dxc.junit.opcodes.jsr.jm.T_jsr_1.i1 I
-    ret 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_1.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_1.java
deleted file mode 100644
index d148104..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_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 dxc.junit.opcodes.jsr.jm;
-
-public class T_jsr_1 {
-    public int i1;
-    
-    private void setfield() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_2.j b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_2.j
deleted file mode 100644
index ee1ffac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_2.j
+++ /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_jsr_2.java
-.class public dxc/junit/opcodes/jsr/jm/T_jsr_2
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 3
-    
-    jsr SetField
-
-    aload_0
-    getfield dxc.junit.opcodes.jsr.jm.T_jsr_2.i1 I
-    sipush 1000
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_1
-    aload_0
-    sipush 500
-    putfield dxc.junit.opcodes.jsr.jm.T_jsr_2.i1 I
-    
-    jsr SetField1
-    
-    ret 1
-    
-SetField1:
-    astore_2
-    aload_0
-    sipush 1000
-    putfield dxc.junit.opcodes.jsr.jm.T_jsr_2.i1 I
-    ret 2
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_2.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_2.java
deleted file mode 100644
index 10e4303..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_2.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 dxc.junit.opcodes.jsr.jm;
-
-public class T_jsr_2 {
-    public int i1;
-    
-    private void setfield() {
-        i1 = 500;
-        setfield1();
-    }
-    
-    private void setfield1() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_3.cfh b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_3.cfh
deleted file mode 100644
index 6deff56..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_3.cfh
+++ /dev/null
@@ -1,219 +0,0 @@
-//@class:dxc/junit/opcodes/jsr/jm/T_jsr_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0010
-// .  .  
-   00 10 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0f 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 3, h: 0005: type{dxc.junit.opcodes.jsr.jm.T_jsr_3}
-    // .  .  .  
-       07 00 0d 
-    // parsed:, offset 59, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 65, len 5, h: 0007: utf8{"i1"}
-    // .  .  .  i  1  
-       01 00 02 69 31 
-    // parsed:, offset 70, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0c 
-    // parsed:, offset 75, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 82, len 6, h: 000a: utf8{"()Z"}
-    // .  .  .  (  )  Z  
-       01 00 03 28 29 5a 
-    // parsed:, offset 88, len 15, h: 000b: utf8{"T_jsr_3.java"}
-    // .  .  .  T  _  j  s  r  _  3  .  j  a  v  a  
-       01 00 0c 54 5f 6a 73 72 5f 33 2e 6a 61 76 61 
-    // parsed:, offset 103, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 109, len 35, h: 000d: utf8{"dxc/junit/opcodes/jsr/jm/T_jsr_3"}
-    // .  .     d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  j  s  r  /  j  m  /  T  _  j  s  r  _  3  
-       01 00 20 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6a 73 72 2f 6a 6d 2f 54 5f 6a 73 72 5f 33 
-    // parsed:, offset 144, len 4, h: 000e: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 148, len 3, h: 000f: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 151, len 0, h: end constant_pool
-// parsed:, offset 151, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 153, len 2, h: this_class: type{dxc.junit.opcodes.jsr.jm.T_jsr_3}
-// .  .  
-   00 05 
-// parsed:, offset 155, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0f 
-// parsed:, offset 157, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 159, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:i1, offset 161, len:90,desc: I
-// parsed:, offset 161, len 0, h:  fields[0]: 
-    // parsed:, offset 161, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 163, len 2, h: name: i1
-    // .  .  
-       00 07 
-    // parsed:, offset 165, len 2, h: descriptor: I
-    // .  .  
-       00 0e 
-    // parsed:, offset 167, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 169, len 0, h: end fields[0] 
-// ========== end-ParseMember:i1, desc: I
-// parsed:, offset 169, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 171, len:80,desc: ()V
-// parsed:, offset 171, len 0, h:  methods[0]: 
-    // parsed:, offset 171, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 173, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 175, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 177, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 179, len 0, h:  attributes[0]: 
-        // parsed:, offset 179, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 181, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 185, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 187, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 189, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 198, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 200, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 202, len 0, h: end attributes[0] 
-// parsed:, offset 202, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 202, len:49,desc: ()Z
-// parsed:, offset 202, len 0, h:  methods[1]: 
-    // parsed:, offset 202, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 204, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 206, len 2, h: descriptor: ()Z
-    // .  .  
-       00 0a 
-    // parsed:, offset 208, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 210, len 0, h:  attributes[0]: 
-        // parsed:, offset 210, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 212, len 4, h: length: 00000019
-        // .  .  .  .  
-           00 00 00 19 
-        // parsed:, offset 216, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 218, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 220, len 4, h: code_length: 0000000d
-        // .  .  .  .  
-           00 00 00 0d 
-        // parsed:, offset 0, len 3, h: 0000: jsr 0007
-        // .  .  .  
-//@mod           a8 00 07 
-           a8 00 08 
-        // parsed:, offset 3, len 1, h: 0003: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 4, len 1, h: 0004: ireturn
-        // .  
-           ac 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 4, h: 0007: wide astore 0001
-        // .  :  .  .  
-           c4 3a 00 01 
-        // parsed:, offset 11, len 2, h: 000b: ret 01
-        // .  .  
-           a9 01 
-        // parsed:, offset 237, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 239, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 241, len 0, h: end attributes[0] 
-// parsed:, offset 241, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()Z
-// parsed:, offset 241, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 243, len 0, h:  attributes[0]: 
-    // parsed:, offset 243, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 245, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 249, len 2, h: source: utf8{"T_jsr_3.java"}
-    // .  .  
-       00 0b 
-// parsed:, offset 251, len 0, h: end attributes[0] 
-// parsed:, offset 251, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_3.j b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_3.j
deleted file mode 100644
index f0f987a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_3.j
+++ /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_jsr_3.java
-.class public dxc/junit/opcodes/jsr/jm/T_jsr_3
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    jsr SetField
-
-    iconst_0
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_w 1
-    ret 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_3.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_3.java
deleted file mode 100644
index 2d5b6a5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_3.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 dxc.junit.opcodes.jsr.jm;
-
-public class T_jsr_3 {
-
-    public int i1;
-    
-    private void setfield() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_4.j b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_4.j
deleted file mode 100644
index 3282061..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_4.j
+++ /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_jsr_4.java
-.class public dxc/junit/opcodes/jsr/jm/T_jsr_4
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    jsr SetField
-    aload_0
-    getfield dxc.junit.opcodes.jsr.jm.T_jsr_4.i1 I
-    sipush 1000
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_1
-    aload_0
-    sipush 1000
-    putfield dxc.junit.opcodes.jsr.jm.T_jsr_4.i1 I
- 
-    jsr SetField
-  
-    ret 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_4.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_4.java
deleted file mode 100644
index ec13147..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_4.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 dxc.junit.opcodes.jsr.jm;
-
-public class T_jsr_4 {
-
-    public int i1;
-    
-    private void setfield() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_5.cfh
deleted file mode 100644
index 6ecea6a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_5.cfh
+++ /dev/null
@@ -1,246 +0,0 @@
-//@class:dxc/junit/opcodes/jsr/jm/T_jsr_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0f 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 3, h: 0004: type{dxc.junit.opcodes.jsr.jm.T_jsr_5}
-    // .  .  .  
-       07 00 0e 
-    // parsed:, offset 50, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 59, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 65, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0d 
-    // parsed:, offset 70, len 5, h: 0008: utf8{"i1"}
-    // .  .  .  i  1  
-       01 00 02 69 31 
-    // parsed:, offset 75, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 82, len 15, h: 000a: utf8{"T_jsr_5.java"}
-    // .  .  .  T  _  j  s  r  _  5  .  j  a  v  a  
-       01 00 0c 54 5f 6a 73 72 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 97, len 6, h: 000b: utf8{"()Z"}
-    // .  .  .  (  )  Z  
-       01 00 03 28 29 5a 
-    // parsed:, offset 103, len 5, h: 000c: field{dxc.junit.opcodes.jsr.jm.T_jsr_5.i1:I}
-    // .  .  .  .  .  
-       09 00 04 00 11 
-    // parsed:, offset 108, len 6, h: 000d: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 114, len 35, h: 000e: utf8{"dxc/junit/opcodes/jsr/jm/T_jsr_5"}
-    // .  .     d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  j  s  r  /  j  m  /  T  _  j  s  r  _  5  
-       01 00 20 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6a 73 72 2f 6a 6d 2f 54 5f 6a 73 72 5f 35 
-    // parsed:, offset 149, len 3, h: 000f: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 152, len 4, h: 0010: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 156, len 5, h: 0011: nat{i1:I}
-    // .  .  .  .  .  
-       0c 00 08 00 10 
-// parsed:, offset 161, len 0, h: end constant_pool
-// parsed:, offset 161, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 163, len 2, h: this_class: type{dxc.junit.opcodes.jsr.jm.T_jsr_5}
-// .  .  
-   00 04 
-// parsed:, offset 165, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0f 
-// parsed:, offset 167, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 169, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:i1, offset 171, len:104,desc: I
-// parsed:, offset 171, len 0, h:  fields[0]: 
-    // parsed:, offset 171, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 173, len 2, h: name: i1
-    // .  .  
-       00 08 
-    // parsed:, offset 175, len 2, h: descriptor: I
-    // .  .  
-       00 10 
-    // parsed:, offset 177, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 179, len 0, h: end fields[0] 
-// ========== end-ParseMember:i1, desc: I
-// parsed:, offset 179, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 181, len:94,desc: ()V
-// parsed:, offset 181, len 0, h:  methods[0]: 
-    // parsed:, offset 181, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 183, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 185, len 2, h: descriptor: ()V
-    // .  .  
-       00 0d 
-    // parsed:, offset 187, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 0, h:  attributes[0]: 
-        // parsed:, offset 189, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 191, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 195, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 197, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 199, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 208, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 210, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 212, len 0, h: end attributes[0] 
-// parsed:, offset 212, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 212, len:63,desc: ()Z
-// parsed:, offset 212, len 0, h:  methods[1]: 
-    // parsed:, offset 212, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 214, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 216, len 2, h: descriptor: ()Z
-    // .  .  
-       00 0b 
-    // parsed:, offset 218, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 220, len 0, h:  attributes[0]: 
-        // parsed:, offset 220, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 222, len 4, h: length: 00000027
-        // .  .  .  '  
-           00 00 00 27 
-        // parsed:, offset 226, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 228, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 230, len 4, h: code_length: 0000001b
-        // .  .  .  .  
-           00 00 00 1b 
-        // parsed:, offset 0, len 3, h: 0000: jsr 0011
-        // .  .  .  
-//@mod           a8 00 11 
-           a8 00 ff 
-        // parsed:, offset 3, len 1, h: 0003: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 4, len 3, h: 0004: getfield field{dxc.junit.opcodes.jsr.jm.T_jsr_5.i1:I}
-        // .  .  .  
-           b4 00 0c 
-        // parsed:, offset 7, len 3, h: 0007: sipush #+03e8
-        // .  .  .  
-           11 03 e8 
-        // parsed:, offset 10, len 3, h: 000a: if_icmpne 000f
-        // .  .  .  
-           a0 00 05 
-        // parsed:, offset 13, len 1, h: 000d: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 14, len 1, h: 000e: ireturn
-        // .  
-           ac 
-        // parsed:, offset 15, len 1, h: 000f: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 16, len 1, h: 0010: ireturn
-        // .  
-           ac 
-        // parsed:, offset 17, len 1, h: 0011: astore_1 // 01
-        // L  
-           4c 
-        // parsed:, offset 18, len 1, h: 0012: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 19, len 3, h: 0013: sipush #+03e8
-        // .  .  .  
-           11 03 e8 
-        // parsed:, offset 22, len 3, h: 0016: putfield field{dxc.junit.opcodes.jsr.jm.T_jsr_5.i1:I}
-        // .  .  .  
-           b5 00 0c 
-        // parsed:, offset 25, len 2, h: 0019: ret 01
-        // .  .  
-           a9 01 
-        // parsed:, offset 261, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 263, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 265, len 0, h: end attributes[0] 
-// parsed:, offset 265, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()Z
-// parsed:, offset 265, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 267, len 0, h:  attributes[0]: 
-    // parsed:, offset 267, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 269, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 273, len 2, h: source: utf8{"T_jsr_5.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 275, len 0, h: end attributes[0] 
-// parsed:, offset 275, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_5.j b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_5.j
deleted file mode 100644
index d369389..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_5.j
+++ /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 T_jsr_5.java
-.class public dxc/junit/opcodes/jsr/jm/T_jsr_5
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    jsr SetField
-
-    aload_0
-    getfield dxc.junit.opcodes.jsr.jm.T_jsr_5.i1 I
-    sipush 1000
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_1
-    aload_0
-    sipush 1000
-    putfield dxc.junit.opcodes.jsr.jm.T_jsr_5.i1 I
-    
-    ret 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_5.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_5.java
deleted file mode 100644
index 6e99e92..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr/jm/T_jsr_5.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 dxc.junit.opcodes.jsr.jm;
-
-public class T_jsr_5 {
-
-    public int i1;
-    
-    private void setfield() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/Test_jsr_w.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/Test_jsr_w.java
deleted file mode 100644
index 65e3320..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/Test_jsr_w.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 dxc.junit.opcodes.jsr_w;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.jsr_w.jm.T_jsr_w_1;
-import dxc.junit.opcodes.jsr_w.jm.T_jsr_w_2;
-
-public class Test_jsr_w extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_jsr_w_1 t = new T_jsr_w_1();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @title  nested jsrs
-     */
-    public void testN2() {
-        T_jsr_w_2 t = new T_jsr_w_2();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.23
-     * @title recursion of jsr
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.jsr_w.jm.T_jsr_w_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.jsr_w.jm.T_jsr_w_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target inside wide instruction
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.jsr_w.jm.T_jsr_w_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_1.j b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_1.j
deleted file mode 100644
index b1e3523..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_1.j
+++ /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_jsr_w_1.java
-.class public dxc/junit/opcodes/jsr_w/jm/T_jsr_w_1
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    jsr_w SetField
-
-    aload_0
-    getfield dxc.junit.opcodes.jsr_w.jm.T_jsr_w_1.i1 I
-    sipush 1000
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_1
-    aload_0
-    sipush 1000
-    putfield dxc.junit.opcodes.jsr_w.jm.T_jsr_w_1.i1 I
-    ret 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_1.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_1.java
deleted file mode 100644
index 7dbb6b5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_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 dxc.junit.opcodes.jsr_w.jm;
-
-public class T_jsr_w_1 {
-    public int i1;
-    
-    private void setfield() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_2.j b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_2.j
deleted file mode 100644
index c9eb7b5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_2.j
+++ /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_jsr_w_2.java
-.class public dxc/junit/opcodes/jsr_w/jm/T_jsr_w_2
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 3
-    
-    jsr_w SetField
-
-    aload_0
-    getfield dxc.junit.opcodes.jsr_w.jm.T_jsr_w_2.i1 I
-    sipush 1000
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_1
-    aload_0
-    sipush 500
-    putfield dxc.junit.opcodes.jsr_w.jm.T_jsr_w_2.i1 I
-    
-    jsr_w SetField1
-    
-    ret 1
-    
-SetField1:
-    astore_2
-    aload_0
-    sipush 1000
-    putfield dxc.junit.opcodes.jsr_w.jm.T_jsr_w_2.i1 I
-    ret 2
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_2.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_2.java
deleted file mode 100644
index cd78013..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_2.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 dxc.junit.opcodes.jsr_w.jm;
-
-public class T_jsr_w_2 {
-    public int i1;
-    
-    private void setfield() {
-        i1 = 500;
-        setfield1();
-    }
-    
-    private void setfield1() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3.cfh b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3.cfh
deleted file mode 100644
index af25bac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3.cfh
+++ /dev/null
@@ -1,219 +0,0 @@
-//@class:dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0010
-// .  .  
-   00 10 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0f 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 17, h: 0004: utf8{"T_jsr_w_3.java"}
-    // .  .  .  T  _  j  s  r  _  w  _  3  .  j  a  v  a  
-       01 00 0e 54 5f 6a 73 72 5f 77 5f 33 2e 6a 61 76 61 
-    // parsed:, offset 64, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 73, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 79, len 5, h: 0007: utf8{"i1"}
-    // .  .  .  i  1  
-       01 00 02 69 31 
-    // parsed:, offset 84, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0d 
-    // parsed:, offset 89, len 39, h: 0009: utf8{"dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3"}
-    // .  .  $  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  j  s  r  _  w  /  j  m  /  T  _  j  s  r  _  w  _  3  
-       01 00 24 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6a 73 72 5f 77 2f 6a 6d 2f 54 5f 6a 73 72 5f 77 5f 33 
-    // parsed:, offset 128, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 135, len 6, h: 000b: utf8{"()Z"}
-    // .  .  .  (  )  Z  
-       01 00 03 28 29 5a 
-    // parsed:, offset 141, len 3, h: 000c: type{dxc.junit.opcodes.jsr_w.jm.T_jsr_w_3}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 144, len 6, h: 000d: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 150, len 4, h: 000e: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 154, len 3, h: 000f: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 157, len 0, h: end constant_pool
-// parsed:, offset 157, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 159, len 2, h: this_class: type{dxc.junit.opcodes.jsr_w.jm.T_jsr_w_3}
-// .  .  
-   00 0c 
-// parsed:, offset 161, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0f 
-// parsed:, offset 163, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 165, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:i1, offset 167, len:92,desc: I
-// parsed:, offset 167, len 0, h:  fields[0]: 
-    // parsed:, offset 167, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 169, len 2, h: name: i1
-    // .  .  
-       00 07 
-    // parsed:, offset 171, len 2, h: descriptor: I
-    // .  .  
-       00 0e 
-    // parsed:, offset 173, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 175, len 0, h: end fields[0] 
-// ========== end-ParseMember:i1, desc: I
-// parsed:, offset 175, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 177, len:82,desc: ()V
-// parsed:, offset 177, len 0, h:  methods[0]: 
-    // parsed:, offset 177, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 179, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 181, len 2, h: descriptor: ()V
-    // .  .  
-       00 0d 
-    // parsed:, offset 183, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 185, len 0, h:  attributes[0]: 
-        // parsed:, offset 185, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 187, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 191, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 193, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 195, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 204, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 206, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 208, len 0, h: end attributes[0] 
-// parsed:, offset 208, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 208, len:51,desc: ()Z
-// parsed:, offset 208, len 0, h:  methods[1]: 
-    // parsed:, offset 208, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 210, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 212, len 2, h: descriptor: ()Z
-    // .  .  
-       00 0b 
-    // parsed:, offset 214, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 216, len 0, h:  attributes[0]: 
-        // parsed:, offset 216, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 218, len 4, h: length: 0000001b
-        // .  .  .  .  
-           00 00 00 1b 
-        // parsed:, offset 222, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 224, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 226, len 4, h: code_length: 0000000f
-        // .  .  .  .  
-           00 00 00 0f 
-        // parsed:, offset 0, len 5, h: 0000: jsr_w 00000009
-        // .  .  .  .  .  
-//@mod           c9 00 00 00 09 
-           c9 00 00 00 0a 
-        // parsed:, offset 5, len 1, h: 0005: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 7, len 1, h: 0007: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 8, len 1, h: 0008: ireturn
-        // .  
-           ac 
-        // parsed:, offset 9, len 4, h: 0009: wide astore 0001
-        // .  :  .  .  
-           c4 3a 00 01 
-        // parsed:, offset 13, len 2, h: 000d: ret 01
-        // .  .  
-           a9 01 
-        // parsed:, offset 245, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 247, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 249, len 0, h: end attributes[0] 
-// parsed:, offset 249, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()Z
-// parsed:, offset 249, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 251, len 0, h:  attributes[0]: 
-    // parsed:, offset 251, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 253, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 257, len 2, h: source: utf8{"T_jsr_w_3.java"}
-    // .  .  
-       00 04 
-// parsed:, offset 259, len 0, h: end attributes[0] 
-// parsed:, offset 259, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3.j b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3.j
deleted file mode 100644
index 7be029b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3.j
+++ /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_jsr_w_3.java
-.class public dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    jsr_w SetField
-
-    iconst_0
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_w 1
-    ret 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3.java
deleted file mode 100644
index 125de8a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_3.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 dxc.junit.opcodes.jsr_w.jm;
-
-public class T_jsr_w_3 {
-
-    public int i1;
-    
-    private void setfield() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_4.j b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_4.j
deleted file mode 100644
index 0fdd704..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_4.j
+++ /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_jsr_w_4.java
-.class public dxc/junit/opcodes/jsr_w/jm/T_jsr_w_4
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    jsr_w SetField
-
-    aload_0
-    getfield dxc.junit.opcodes.jsr_w.jm.T_jsr_w_4.i1 I
-    sipush 1000
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_1
-    aload_0
-    sipush 1000
-    putfield dxc.junit.opcodes.jsr_w.jm.T_jsr_w_4.i1 I
- 
-    jsr_w SetField
-  
-    ret 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_4.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_4.java
deleted file mode 100644
index c58f2f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_4.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 dxc.junit.opcodes.jsr_w.jm;
-
-public class T_jsr_w_4 {
-
-    public int i1;
-    
-    private void setfield() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5.cfh
deleted file mode 100644
index b0bb2e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5.cfh
+++ /dev/null
@@ -1,246 +0,0 @@
-//@class:dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 3, h: 0004: type{dxc.junit.opcodes.jsr_w.jm.T_jsr_w_5}
-    // .  .  .  
-       07 00 07 
-    // parsed:, offset 50, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 59, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 65, len 39, h: 0007: utf8{"dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5"}
-    // .  .  $  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  j  s  r  _  w  /  j  m  /  T  _  j  s  r  _  w  _  5  
-       01 00 24 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6a 73 72 5f 77 2f 6a 6d 2f 54 5f 6a 73 72 5f 77 5f 35 
-    // parsed:, offset 104, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0c 
-    // parsed:, offset 109, len 5, h: 0009: utf8{"i1"}
-    // .  .  .  i  1  
-       01 00 02 69 31 
-    // parsed:, offset 114, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 121, len 6, h: 000b: utf8{"()Z"}
-    // .  .  .  (  )  Z  
-       01 00 03 28 29 5a 
-    // parsed:, offset 127, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 133, len 5, h: 000d: field{dxc.junit.opcodes.jsr_w.jm.T_jsr_w_5.i1:I}
-    // .  .  .  .  .  
-       09 00 04 00 11 
-    // parsed:, offset 138, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 141, len 4, h: 000f: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 145, len 17, h: 0010: utf8{"T_jsr_w_5.java"}
-    // .  .  .  T  _  j  s  r  _  w  _  5  .  j  a  v  a  
-       01 00 0e 54 5f 6a 73 72 5f 77 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 162, len 5, h: 0011: nat{i1:I}
-    // .  .  .  .  .  
-       0c 00 09 00 0f 
-// parsed:, offset 167, len 0, h: end constant_pool
-// parsed:, offset 167, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 169, len 2, h: this_class: type{dxc.junit.opcodes.jsr_w.jm.T_jsr_w_5}
-// .  .  
-   00 04 
-// parsed:, offset 171, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 173, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 175, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:i1, offset 177, len:106,desc: I
-// parsed:, offset 177, len 0, h:  fields[0]: 
-    // parsed:, offset 177, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 179, len 2, h: name: i1
-    // .  .  
-       00 09 
-    // parsed:, offset 181, len 2, h: descriptor: I
-    // .  .  
-       00 0f 
-    // parsed:, offset 183, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 185, len 0, h: end fields[0] 
-// ========== end-ParseMember:i1, desc: I
-// parsed:, offset 185, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 187, len:96,desc: ()V
-// parsed:, offset 187, len 0, h:  methods[0]: 
-    // parsed:, offset 187, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 191, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 193, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 195, len 0, h:  attributes[0]: 
-        // parsed:, offset 195, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 197, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 201, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 203, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 205, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 214, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 216, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 218, len 0, h: end attributes[0] 
-// parsed:, offset 218, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 218, len:65,desc: ()Z
-// parsed:, offset 218, len 0, h:  methods[1]: 
-    // parsed:, offset 218, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 220, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 222, len 2, h: descriptor: ()Z
-    // .  .  
-       00 0b 
-    // parsed:, offset 224, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 226, len 0, h:  attributes[0]: 
-        // parsed:, offset 226, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 228, len 4, h: length: 00000029
-        // .  .  .  )  
-           00 00 00 29 
-        // parsed:, offset 232, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 234, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 236, len 4, h: code_length: 0000001d
-        // .  .  .  .  
-           00 00 00 1d 
-        // parsed:, offset 0, len 5, h: 0000: jsr_w 00000013
-        // .  .  .  .  .  
-//@mod           c9 00 00 00 13 
-           c9 00 00 00 ff         
-        // parsed:, offset 5, len 1, h: 0005: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 6, len 3, h: 0006: getfield field{dxc.junit.opcodes.jsr_w.jm.T_jsr_w_5.i1:I}
-        // .  .  .  
-           b4 00 0d 
-        // parsed:, offset 9, len 3, h: 0009: sipush #+03e8
-        // .  .  .  
-           11 03 e8 
-        // parsed:, offset 12, len 3, h: 000c: if_icmpne 0011
-        // .  .  .  
-           a0 00 05 
-        // parsed:, offset 15, len 1, h: 000f: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 16, len 1, h: 0010: ireturn
-        // .  
-           ac 
-        // parsed:, offset 17, len 1, h: 0011: iconst_0 // #+00
-        // .  
-           03 
-        // parsed:, offset 18, len 1, h: 0012: ireturn
-        // .  
-           ac 
-        // parsed:, offset 19, len 1, h: 0013: astore_1 // 01
-        // L  
-           4c 
-        // parsed:, offset 20, len 1, h: 0014: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 21, len 3, h: 0015: sipush #+03e8
-        // .  .  .  
-           11 03 e8 
-        // parsed:, offset 24, len 3, h: 0018: putfield field{dxc.junit.opcodes.jsr_w.jm.T_jsr_w_5.i1:I}
-        // .  .  .  
-           b5 00 0d 
-        // parsed:, offset 27, len 2, h: 001b: ret 01
-        // .  .  
-           a9 01 
-        // parsed:, offset 269, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 271, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 273, len 0, h: end attributes[0] 
-// parsed:, offset 273, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()Z
-// parsed:, offset 273, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 275, len 0, h:  attributes[0]: 
-    // parsed:, offset 275, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 277, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 281, len 2, h: source: utf8{"T_jsr_w_5.java"}
-    // .  .  
-       00 10 
-// parsed:, offset 283, len 0, h: end attributes[0] 
-// parsed:, offset 283, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5.j b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5.j
deleted file mode 100644
index 41dd4bb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5.j
+++ /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 T_jsr_w_5.java
-.class public dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    jsr_w SetField
-
-    aload_0
-    getfield dxc.junit.opcodes.jsr_w.jm.T_jsr_w_5.i1 I
-    sipush 1000
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_1
-    aload_0
-    sipush 1000
-    putfield dxc.junit.opcodes.jsr_w.jm.T_jsr_w_5.i1 I
-    
-    ret 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5.java b/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5.java
deleted file mode 100644
index 4693529..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/jsr_w/jm/T_jsr_w_5.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 dxc.junit.opcodes.jsr_w.jm;
-
-public class T_jsr_w_5 {
-
-    public int i1;
-    
-    private void setfield() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/Test_l2d.java b/tools/dx-tests/src/dxc/junit/opcodes/l2d/Test_l2d.java
deleted file mode 100644
index 6b27eab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/Test_l2d.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.l2d;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.l2d.jm.T_l2d_1;
-
-public class Test_l2d extends DxTestCase {
-
-    /**
-     * @title  Argument = 50000000000
-     */
-    public void testN1() {
-        T_l2d_1 t = new T_l2d_1();
-        assertEquals(5.0E10d, t.run(50000000000l), 0d);
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_l2d_1 t = new T_l2d_1();
-        assertEquals(1d, t.run(1l), 0d);
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_l2d_1 t = new T_l2d_1();
-        assertEquals(-1d, t.run(-1l), 0d);
-    }
-
-    /**
-     * @title  Argument = Long.MAX_VALUE
-     */
-    public void testB1() {
-        T_l2d_1 t = new T_l2d_1();
-        assertEquals(9.223372036854776E18d, t.run(Long.MAX_VALUE), 0d);
-    }
-
-    /**
-     * @title  Argument = Long.MIN_VALUE
-     */
-    public void testB2() {
-        T_l2d_1 t = new T_l2d_1();
-        assertEquals(-9.223372036854776E18, t.run(Long.MIN_VALUE), 0d);
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testB3() {
-        T_l2d_1 t = new T_l2d_1();
-        assertEquals(0d, t.run(0), 0d);
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2d.jm.T_l2d_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2d.jm.T_l2d_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - integer
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2d.jm.T_l2d_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2d.jm.T_l2d_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_1.j b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_1.j
deleted file mode 100644
index 0a98eb7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_1.j
+++ /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_l2d_1.java
-.class public dxc/junit/opcodes/l2d/jm/T_l2d_1
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(J)D
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-    l2d
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_1.java b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_1.java
deleted file mode 100644
index 0d4f014..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_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 dxc.junit.opcodes.l2d.jm;
-
-public class T_l2d_1 {
-
-    public double run(long a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_2.j b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_2.j
deleted file mode 100644
index ecf0bf8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_2.j
+++ /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_l2d_2.java
-.class public dxc/junit/opcodes/l2d/jm/T_l2d_2
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(J)D
-    .limit stack 2
-    .limit locals 3
-
-;    lload_1
-    l2d
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_2.java b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_2.java
deleted file mode 100644
index fbba547..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_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 dxc.junit.opcodes.l2d.jm;
-
-public class T_l2d_2 {
-
-    public double run(long a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_3.j b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_3.j
deleted file mode 100644
index b529402..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_3.j
+++ /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_l2d_3.java
-.class public dxc/junit/opcodes/l2d/jm/T_l2d_3
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(F)D
-    .limit stack 2
-    .limit locals 2
-
-    fload_1
-    l2d
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_3.java b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_3.java
deleted file mode 100644
index 92a342f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_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 dxc.junit.opcodes.l2d.jm;
-
-public class T_l2d_3 {
-
-    public double run(float a) {
-        return a;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_4.j b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_4.j
deleted file mode 100644
index 42c4e7e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_4.j
+++ /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_l2d_4.java
-.class public dxc/junit/opcodes/l2d/jm/T_l2d_4
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(I)D
-    .limit stack 2
-    .limit locals 2
-
-    iload_1
-    l2d
-
-    dreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_4.java b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_4.java
deleted file mode 100644
index 717aedb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_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 dxc.junit.opcodes.l2d.jm;
-
-public class T_l2d_4 {
-
-    public double run(int a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_5.java b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_5.java
deleted file mode 100644
index 4a3ebb5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_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 dxc.junit.opcodes.l2d.jm;
-
-public class T_l2d_5 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_6.java b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_6.java
deleted file mode 100644
index f79957e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_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 dxc.junit.opcodes.l2d.jm;
-
-public class T_l2d_6 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_7.j b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_7.j
deleted file mode 100644
index 70fbabb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_7.j
+++ /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_l2d_7.java
-.class public dxc/junit/opcodes/l2d/jm/T_l2d_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(J)D
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    l2d
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_7.java b/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_7.java
deleted file mode 100644
index 2d04278..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2d/jm/T_l2d_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 dxc.junit.opcodes.l2d.jm;
-
-public class T_l2d_7 {
-    
-    public double run(long a) {
-        return a;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/Test_l2f.java b/tools/dx-tests/src/dxc/junit/opcodes/l2f/Test_l2f.java
deleted file mode 100644
index 7b1d277..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/Test_l2f.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.l2f;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.l2f.jm.T_l2f_1;
-
-public class Test_l2f extends DxTestCase {
-
-    /**
-     * @title  Argument = 123456789012345
-     */
-    public void testN1() {
-        T_l2f_1 t = new T_l2f_1();
-        assertEquals(1.23456788E14f, t.run(123456789012345l), 0f);
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_l2f_1 t = new T_l2f_1();
-        assertEquals(1f, t.run(1l), 0f);
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_l2f_1 t = new T_l2f_1();
-        assertEquals(-1f, t.run(-1l), 0f);
-    }
-
-    /**
-     * @title  Argument = Long.MAX_VALUE
-     */
-    public void testB1() {
-        T_l2f_1 t = new T_l2f_1();
-        assertEquals(9.223372036854776E18, t.run(Long.MAX_VALUE), 0f);
-    }
-
-    /**
-     * @title  Argument = Long.MIN_VALUE
-     */
-    public void testB2() {
-        T_l2f_1 t = new T_l2f_1();
-        assertEquals(-9.223372036854776E18, t.run(Long.MIN_VALUE), 0f);
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testB3() {
-        T_l2f_1 t = new T_l2f_1();
-        assertEquals(0f, t.run(0l), 0f);
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2f.jm.T_l2f_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2f.jm.T_l2f_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - integer
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2f.jm.T_l2f_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2f.jm.T_l2f_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_1.j b/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_1.j
deleted file mode 100644
index 69cd105..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_1.j
+++ /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_l2f_1.java
-.class public dxc/junit/opcodes/l2f/jm/T_l2f_1
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(J)F
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-    l2f
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_1.java b/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_1.java
deleted file mode 100644
index a115daf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_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 dxc.junit.opcodes.l2f.jm;
-
-public class T_l2f_1 {
-
-    public float run(long a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_2.j b/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_2.j
deleted file mode 100644
index abc3a02..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_2.j
+++ /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_l2f_2.java
-.class public dxc/junit/opcodes/l2f/jm/T_l2f_2
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(J)F
-    .limit stack 2
-    .limit locals 3
-
-;    lload_1
-    l2f
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_2.java b/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_2.java
deleted file mode 100644
index fde8820..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_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 dxc.junit.opcodes.l2f.jm;
-
-public class T_l2f_2 {
-
-    public float run(long a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_3.j b/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_3.j
deleted file mode 100644
index 55b3efd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_3.j
+++ /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_l2f_3.java
-.class public dxc/junit/opcodes/l2f/jm/T_l2f_3
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(D)F
-    .limit stack 2
-    .limit locals 3
-
-    dload_1
-    l2f
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_3.java b/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_3.java
deleted file mode 100644
index e4e0342..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_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 dxc.junit.opcodes.l2f.jm;
-
-public class T_l2f_3 {
-
-    public float run(double a) {
-        return (float)a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_4.j b/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_4.j
deleted file mode 100644
index 7fa4036..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_4.j
+++ /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_l2f_4.java
-.class public dxc/junit/opcodes/l2f/jm/T_l2f_4
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(I)F
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    l2f
-
-    freturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_4.java b/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_4.java
deleted file mode 100644
index 6bdd0dc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_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 dxc.junit.opcodes.l2f.jm;
-
-public class T_l2f_4 {
-
-    public float run(int a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_5.j b/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_5.j
deleted file mode 100644
index 8addc20..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_5.j
+++ /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_l2f_5.java
-.class public dxc/junit/opcodes/l2f/jm/T_l2f_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(J)F
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    l2f
-    freturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_5.java b/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_5.java
deleted file mode 100644
index dae1222..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2f/jm/T_l2f_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 dxc.junit.opcodes.l2f.jm;
-
-public class T_l2f_5 {
-    
-    public float run(long a) {
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/Test_l2i.java b/tools/dx-tests/src/dxc/junit/opcodes/l2i/Test_l2i.java
deleted file mode 100644
index 627e5fc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/Test_l2i.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 dxc.junit.opcodes.l2i;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.l2i.jm.T_l2i_1;
-
-public class Test_l2i extends DxTestCase {
-
-    /**
-     * @title  Argument = 0xAAAAFFEEDDCCl
-     */
-    public void testN1() {
-        T_l2i_1 t = new T_l2i_1();
-        assertEquals(0xFFEEDDCC, t.run(0xAAAAFFEEDDCCl));
-    }
-
-    /**
-     * @title  Argument = -123456789
-     */
-    public void testN2() {
-        T_l2i_1 t = new T_l2i_1();
-        assertEquals(-123456789, t.run(-123456789l));
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN3() {
-        T_l2i_1 t = new T_l2i_1();
-        assertEquals(1, t.run(1l));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN4() {
-        T_l2i_1 t = new T_l2i_1();
-        assertEquals(-1, t.run(-1l));
-    }
-
-    /**
-     * @title  Argument = Long.MAX_VALUE
-     */
-    public void testB1() {
-        T_l2i_1 t = new T_l2i_1();
-        assertEquals(-1, t.run(Long.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Long.MIN_VALUE
-     */
-    public void testB2() {
-        T_l2i_1 t = new T_l2i_1();
-        assertEquals(0, t.run(Long.MIN_VALUE));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testB3() {
-        T_l2i_1 t = new T_l2i_1();
-        assertEquals(0, t.run(0l));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2i.jm.T_l2i_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2i.jm.T_l2i_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2i.jm.T_l2i_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.l2i.jm.T_l2i_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_1.j b/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_1.j
deleted file mode 100644
index 7acd7e2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_1.j
+++ /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_l2i_1.java
-.class public dxc/junit/opcodes/l2i/jm/T_l2i_1
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(J)I
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-    l2i
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_1.java b/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_1.java
deleted file mode 100644
index a871771..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_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 dxc.junit.opcodes.l2i.jm;
-
-public class T_l2i_1 {
-
-    public int run(long a) {
-        return (int) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_2.j b/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_2.j
deleted file mode 100644
index d2a23ac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_2.j
+++ /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_l2i_2.java
-.class public dxc/junit/opcodes/l2i/jm/T_l2i_2
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(J)I
-    .limit stack 2
-    .limit locals 3
-
-;    lload_1
-    l2i
-
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_2.java b/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_2.java
deleted file mode 100644
index beabb5f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_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 dxc.junit.opcodes.l2i.jm;
-
-public class T_l2i_2 {
-
-    public int run(long a) {
-        return (int) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_3.j b/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_3.j
deleted file mode 100644
index 013f9b1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_3.j
+++ /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_l2i_3.java
-.class public dxc/junit/opcodes/l2i/jm/T_l2i_3
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(D)I
-    .limit stack 2
-    .limit locals 3
-
-    dload_1
-    l2i
-
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_3.java b/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_3.java
deleted file mode 100644
index edcc6d9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_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 dxc.junit.opcodes.l2i.jm;
-
-public class T_l2i_3 {
-
-    public int run(double a) {
-        return (int) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_4.j b/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_4.j
deleted file mode 100644
index acc31bd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_4.j
+++ /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_l2i_4.java
-.class public dxc/junit/opcodes/l2i/jm/T_l2i_4
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(F)I
-    .limit stack 2
-    .limit locals 3
-
-    fload_1
-    l2i
-
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_4.java b/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_4.java
deleted file mode 100644
index af8320c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_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 dxc.junit.opcodes.l2i.jm;
-
-public class T_l2i_4 {
-
-    public int run(float a) {
-        return (int) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_5.j b/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_5.j
deleted file mode 100644
index 8ee7bcd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_5.j
+++ /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_l2i_5.java
-.class public dxc/junit/opcodes/l2i/jm/T_l2i_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(J)I
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    l2i
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_5.java b/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_5.java
deleted file mode 100644
index 1ffbb57..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/l2i/jm/T_l2i_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 dxc.junit.opcodes.l2i.jm;
-
-public class T_l2i_5 {
-    
-    public int run(long a) {
-        return (int) a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/Test_ladd.java b/tools/dx-tests/src/dxc/junit/opcodes/ladd/Test_ladd.java
deleted file mode 100644
index 7c37739..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/Test_ladd.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 dxc.junit.opcodes.ladd;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ladd.jm.T_ladd_1;
-
-public class Test_ladd extends DxTestCase {
-
-    /**
-     * @title Arguments = 12345678l, 87654321l
-     */
-    public void testN1() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(99999999l, t.run(12345678l, 87654321l));
-    }
-
-    /**
-     * @title Arguments = 0l, 87654321l
-     */
-    public void testN2() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(87654321l, t.run(0l, 87654321l));
-    }
-
-    /**
-     * @title Arguments = -12345678l, 0l
-     */
-    public void testN3() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(-12345678l, t.run(-12345678l, 0l));
-    }
-
-    /**
-     * @title  Arguments: 0 + Long.MAX_VALUE
-     */
-    public void testB1() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(9223372036854775807L, t.run(0l, Long.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments: 0 + Long.MIN_VALUE
-     */
-    public void testB2() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(-9223372036854775808L, t.run(0l, Long.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments: 0 + 0
-     */
-    public void testB3() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(0l, t.run(0l, 0l));
-    }
-
-    /**
-     * @title  Arguments: Long.MAX_VALUE + Long.MAX_VALUE
-     */
-    public void testB4() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(-2, t.run(Long.MAX_VALUE, Long.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments: Long.MAX_VALUE + Long.MIN_VALUE
-     */
-    public void testB5() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(-1l, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments: Long.MIN_VALUE + Long.MIN_VALUE
-     */
-    public void testB6() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(0l, t.run(Long.MIN_VALUE, Long.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments: Long.MIN_VALUE + 1
-     */
-    public void testB7() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(-9223372036854775807l, t.run(Long.MIN_VALUE, 1l));
-    }
-
-    /**
-     * @title  Arguments: Long.MAX_VALUE + 1
-     */
-    public void testB8() {
-        T_ladd_1 t = new T_ladd_1();
-        assertEquals(-9223372036854775808l, t.run(Long.MAX_VALUE, 1l));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ladd.jm.T_ladd_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ladd.jm.T_ladd_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / integer
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ladd.jm.T_ladd_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ladd.jm.T_ladd_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference / long
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ladd.jm.T_ladd_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_1.j
deleted file mode 100644
index 03b8556..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_1.j
+++ /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_ladd_1.java
-.class public dxc/junit/opcodes/ladd/jm/T_ladd_1
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    lload_3
-    ladd
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_1.java
deleted file mode 100644
index 56c7f9a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_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 dxc.junit.opcodes.ladd.jm;
-
-public class T_ladd_1 {
-
-    public long run(long a, long b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_2.j
deleted file mode 100644
index 5757930..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_2.j
+++ /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_ladd_2.java
-.class public dxc/junit/opcodes/ladd/jm/T_ladd_2
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-;    lload_1
-    lload_3
-    ladd
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_2.java
deleted file mode 100644
index 98d4e78..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_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 dxc.junit.opcodes.ladd.jm;
-
-public class T_ladd_2 {
-
-    public long run(long a, long b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_3.j
deleted file mode 100644
index 0fb7885..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_3.j
+++ /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_ladd_3.java
-.class public dxc/junit/opcodes/ladd/jm/T_ladd_3
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(JD)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    dload_3
-;    d2l    
-    ladd
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_3.java
deleted file mode 100644
index cc306af..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_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 dxc.junit.opcodes.ladd.jm;
-
-public class T_ladd_3 {
-
-    public long run(long a, double b) {
-        return (long)(a+b);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_4.j
deleted file mode 100644
index da9d27f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_4.j
+++ /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_ladd_4.java
-.class public dxc/junit/opcodes/ladd/jm/T_ladd_4
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(JI)J
-    .limit stack 4
-    .limit locals 4
-
-    lload_1
-    iload_3
-;    i2l
-    ladd
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_4.java
deleted file mode 100644
index 0412967..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_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 dxc.junit.opcodes.ladd.jm;
-
-public class T_ladd_4 {
-
-    public long run(long a, int b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_5.j
deleted file mode 100644
index fbb7d16..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_5.j
+++ /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_ladd_5.java
-.class public dxc/junit/opcodes/ladd/jm/T_ladd_5
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(JF)J
-    .limit stack 4
-    .limit locals 4
-
-    lload_1
-    fload_3
-;    f2l    
-    ladd
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_5.java
deleted file mode 100644
index 0468585..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_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 dxc.junit.opcodes.ladd.jm;
-
-public class T_ladd_5 {
-
-    public long run(long a, float b) {
-        return (long)(a+b);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_6.j
deleted file mode 100644
index c82e12e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ladd_6.java
-.class public dxc/junit/opcodes/ladd/jm/T_ladd_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    aload_0
-    lload_3
-    ladd
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_6.java
deleted file mode 100644
index b7fefc4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ladd/jm/T_ladd_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 dxc.junit.opcodes.ladd.jm;
-
-public class T_ladd_6 {
-    
-    public long run(long a, long b) {
-        return a+b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/Test_laload.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/Test_laload.java
deleted file mode 100644
index a4c0b97..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/Test_laload.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.laload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.laload.jm.T_laload_1;
-
-public class Test_laload extends DxTestCase {
-
-    /**
-     * @title normal test. trying different indexes
-     */
-    public void testN1() {
-        T_laload_1 t = new T_laload_1();
-        long[] arr = new long[2];
-        arr[1] = 1000000000000000000l;
-        assertEquals(1000000000000000000l, t.run(arr, 1));
-    }
-
-    /**
-     * @title normal test. trying different indexes
-     */
-    public void testN2() {
-        T_laload_1 t = new T_laload_1();
-        long[] arr = new long[2];
-        arr[0] = 1000000000000000000l;
-        assertEquals(1000000000000000000l, t.run(arr, 0));
-    }
-
-    /**
-     * @title  Exception - ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_laload_1 t = new T_laload_1();
-        long[] arr = new long[2];
-        try {
-            t.run(arr, 2);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Exception - NullPointerException
-     */
-    public void testE2() {
-        T_laload_1 t = new T_laload_1();
-        try {
-            t.run(null, 2);
-            fail("expected NullPointerException");
-        } catch (NullPointerException np) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Exception - ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_laload_1 t = new T_laload_1();
-        long[] arr = new long[2];
-        try {
-            t.run(arr, -1);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.laload.jm.T_laload_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.laload.jm.T_laload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.laload.jm.T_laload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.laload.jm.T_laload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, long
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.laload.jm.T_laload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - Object, long
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.laload.jm.T_laload_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], long
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.laload.jm.T_laload_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int[], long
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.laload.jm.T_laload_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference
-     */
-    public void testVFE9() {
-        try {
-            Class.forName("dxc.junit.opcodes.laload.jm.T_laload_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_1.j
deleted file mode 100644
index 156aad2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_1.j
+++ /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_laload_1.java
-.class public dxc/junit/opcodes/laload/jm/T_laload_1
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run([JI)J
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    iload_2
-    
-    laload
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_1.java
deleted file mode 100644
index 0e06614..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_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 dxc.junit.opcodes.laload.jm;
-
-public class T_laload_1 {
-
-    public long run(long[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_10.j b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_10.j
deleted file mode 100644
index ca6cbcf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_10.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_laload_10.java
-.class public dxc/junit/opcodes/laload/jm/T_laload_10
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([JI)J
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    aload_0
-    laload
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_10.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_10.java
deleted file mode 100644
index a6fa4bc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_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 dxc.junit.opcodes.laload.jm;
-
-public class T_laload_10 {
-    
-    public long run(long[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_2.j
deleted file mode 100644
index 0b1bc5b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_2.j
+++ /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_laload_2.java
-.class public dxc/junit/opcodes/laload/jm/T_laload_2
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run([JI)J
-    .limit stack 2
-    .limit locals 3
-
-;    aload_1
-    iload_2
-    laload
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_2.java
deleted file mode 100644
index 93854c9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_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 dxc.junit.opcodes.laload.jm;
-
-public class T_laload_2 {
-
-    public long run(long[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_3.j
deleted file mode 100644
index da77288..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_3.j
+++ /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_laload_3.java
-.class public dxc/junit/opcodes/laload/jm/T_laload_3
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run([JI)J
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-;    iload_2
-    laload
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_3.java
deleted file mode 100644
index 2230c0d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_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 dxc.junit.opcodes.laload.jm;
-
-public class T_laload_3 {
-
-    public long run(long[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_4.j
deleted file mode 100644
index 18646c6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_4.j
+++ /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_laload_4.java
-.class public dxc/junit/opcodes/laload/jm/T_laload_4
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run([JD)J
-    .limit stack 5
-    .limit locals 4
-
-    aload_1
-    dload_2
-;    d2i
-    laload
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_4.java
deleted file mode 100644
index fbff226..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_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 dxc.junit.opcodes.laload.jm;
-
-public class T_laload_4 {
-
-    public long run(long[] arr, double idx) {
-        return arr[(int)idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_5.j
deleted file mode 100644
index 5b8fcae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_5.j
+++ /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_laload_5.java
-.class public dxc/junit/opcodes/laload/jm/T_laload_5
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run([JF)J
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    fload_2
-;    f2i
-    laload
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_5.java
deleted file mode 100644
index b3072a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_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 dxc.junit.opcodes.laload.jm;
-
-public class T_laload_5 {
-
-    public long run(long[] arr, float idx) {
-        return arr[(int)idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_6.j
deleted file mode 100644
index 299b9ae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_6.j
+++ /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_laload_6.java
-.class public dxc/junit/opcodes/laload/jm/T_laload_6
-.super java/lang/Object
-
-
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run([JJ)J
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    lload_2
-;    l2i
-    laload
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_6.java
deleted file mode 100644
index 1d2e294..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_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 dxc.junit.opcodes.laload.jm;
-
-public class T_laload_6 {
-
-    public long run(long[] arr, long idx) {
-        return arr[(int)idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_7.j b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_7.j
deleted file mode 100644
index 747b974..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_7.j
+++ /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_laload_7.java
-.class public dxc/junit/opcodes/laload/jm/T_laload_7
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run(Ljava/lang/Object;[JI)J
-    .limit stack 2
-    .limit locals 4
-
-    aload_1
-    iload_3
-    laload
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_7.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_7.java
deleted file mode 100644
index 3c54ede..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_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 dxc.junit.opcodes.laload.jm;
-
-public class T_laload_7 {
-
-    public long run(Object a, long[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_8.j b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_8.j
deleted file mode 100644
index 8fb0626..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_8.j
+++ /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_laload_8.java
-.class public dxc/junit/opcodes/laload/jm/T_laload_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run([D[JI)J
-    .limit stack 2
-    .limit locals 4
-
-    aload_1
-    iload_3
-    laload
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_8.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_8.java
deleted file mode 100644
index 908c1ad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_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 dxc.junit.opcodes.laload.jm;
-
-public class T_laload_8 {
-
-    public long run(double[] a, long[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_9.j b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_9.j
deleted file mode 100644
index 152895c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_9.j
+++ /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_laload_9.java
-.class public dxc/junit/opcodes/laload/jm/T_laload_9
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run([I[JI)J
-    .limit stack 2
-    .limit locals 4
-
-    aload_1
-    iload_3
-    laload
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_9.java b/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_9.java
deleted file mode 100644
index e4a0373..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/laload/jm/T_laload_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 dxc.junit.opcodes.laload.jm;
-
-public class T_laload_9 {
-
-    public long run(int[] a, long[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/Test_land.java b/tools/dx-tests/src/dxc/junit/opcodes/land/Test_land.java
deleted file mode 100644
index 6902318..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/Test_land.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 dxc.junit.opcodes.land;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.land.jm.T_land_1;
-
-public class Test_land extends DxTestCase {
-
-    /**
-     * @title Arguments = 0xfffffff8aal, 0xfffffff1aal
-     */
-    public void testN1() {
-        T_land_1 t = new T_land_1();
-        assertEquals(0xfffffff0aal, t.run(0xfffffff8aal, 0xfffffff1aal));
-    }
-
-    /**
-     * @title Arguments = 987654321, 123456789
-     */
-    public void testN2() {
-        T_land_1 t = new T_land_1();
-        assertEquals(39471121, t.run(987654321, 123456789));
-    }
-
-    /**
-     * @title  Arguments = 0xABCDEF & -1
-     */
-    public void testN3() {
-        T_land_1 t = new T_land_1();
-        assertEquals(0xABCDEF, t.run(0xABCDEF, -1));
-    }
-
-    /**
-     * @title  Arguments = 0 & -1
-     */
-    public void testB1() {
-        T_land_1 t = new T_land_1();
-        assertEquals(0, t.run(0, -1));
-    }
-
-    /**
-     * @title  Arguments = Long.MAX_VALUE & Long.MIN_VALUE
-     */
-    public void testB2() {
-        T_land_1 t = new T_land_1();
-        assertEquals(0, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.land.jm.T_land_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float & long
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.land.jm.T_land_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int & long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.land.jm.T_land_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference & long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.land.jm.T_land_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_1.j b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_1.j
deleted file mode 100644
index ceffcd2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_1.j
+++ /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_land_1.java
-.class public dxc/junit/opcodes/land/jm/T_land_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    lload_3
-    land
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_1.java b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_1.java
deleted file mode 100644
index dfb8ce3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_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 dxc.junit.opcodes.land.jm;
-
-public class T_land_1 {
-
-    public long run(long a, long b) {
-        return a & b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_2.j b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_2.j
deleted file mode 100644
index ca6c6bd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_2.j
+++ /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_land_2.java
-.class public dxc/junit/opcodes/land/jm/T_land_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-;    lload_3
-    land
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_2.java b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_2.java
deleted file mode 100644
index 2eeb88f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_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 dxc.junit.opcodes.land.jm;
-
-public class T_land_2 {
-
-    public long run(long a, long b) {
-        return a & b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_3.j b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_3.j
deleted file mode 100644
index f2e9b24..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_3.j
+++ /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_land_3.java
-.class public dxc/junit/opcodes/land/jm/T_land_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run(FJ)J
-    .limit stack 4
-    .limit locals 4
-
-    fload_1
-;    f2l
-    lload_2
-    land
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_3.java b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_3.java
deleted file mode 100644
index 4d669ae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_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 dxc.junit.opcodes.land.jm;
-
-public class T_land_3 {
-
-    public long run(float a, long b) {
-        return (long)a & b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_4.j b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_4.j
deleted file mode 100644
index 8387452..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_4.j
+++ /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_land_4.java
-.class public dxc/junit/opcodes/land/jm/T_land_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run(IJ)J
-    .limit stack 4
-    .limit locals 4
-
-    iload_1
-;    i2l
-    lload_2
-    land
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_4.java b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_4.java
deleted file mode 100644
index 05240b8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_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 dxc.junit.opcodes.land.jm;
-
-public class T_land_4 {
-
-    public long run(int a, long b) {
-        return a & b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_5.java b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_5.java
deleted file mode 100644
index 71b07b2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_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 dxc.junit.opcodes.land.jm;
-
-public class T_land_5 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_6.java b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_6.java
deleted file mode 100644
index 1320ff8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_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 dxc.junit.opcodes.land.jm;
-
-public class T_land_6 {
-
-    public void run() {
-        // TODO
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_7.j b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_7.j
deleted file mode 100644
index 7547338..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_land_7.java
-.class public dxc/junit/opcodes/land/jm/T_land_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    aload_0
-    lload_3
-    land
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_7.java b/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_7.java
deleted file mode 100644
index 3df40e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/land/jm/T_land_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 dxc.junit.opcodes.land.jm;
-
-public class T_land_7 {
-    
-    public long run(long a, long b) {
-        return a & b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/Test_lastore.java b/tools/dx-tests/src/dxc/junit/opcodes/lastore/Test_lastore.java
deleted file mode 100644
index 269cdc7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/Test_lastore.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 dxc.junit.opcodes.lastore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lastore.jm.T_lastore_1;
-
-public class Test_lastore extends DxTestCase {
-
-    /**
-     * @title normal test. trying different indexes
-     */
-    public void testN1() {
-        T_lastore_1 t = new T_lastore_1();
-        long[] arr = new long[2];
-        t.run(arr, 1, 100000000000l);
-        assertEquals(100000000000l, arr[1]);
-    }
-
-    /**
-     * @title normal test. trying different indexes
-     */
-    public void testN2() {
-        T_lastore_1 t = new T_lastore_1();
-        long[] arr = new long[2];
-        t.run(arr, 0, 100000000000l);
-        assertEquals(100000000000l, arr[0]);
-    }
-
-    /**
-     * @title  Exception - ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_lastore_1 t = new T_lastore_1();
-        long[] arr = new long[2];
-        try {
-            t.run(arr, 2, 100000000000l);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Exception - NullPointerException
-     */
-    public void testE2() {
-        T_lastore_1 t = new T_lastore_1();
-        try {
-            t.run(null, 1, 100000000000l);
-            fail("expected NullPointerException");
-        } catch (NullPointerException np) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Exception - ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_lastore_1 t = new T_lastore_1();
-        long[] arr = new long[2];
-        try {
-            t.run(arr, -1, 100000000000l);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lastore.jm.T_lastore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lastore.jm.T_lastore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double,
-     * long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lastore.jm.T_lastore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, int, int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lastore.jm.T_lastore_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - object, int, long
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lastore.jm.T_lastore_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], int,
-     * long
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.lastore.jm.T_lastore_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int[], int, long
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.lastore.jm.T_lastore_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference,
-     * long
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.lastore.jm.T_lastore_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_1.j
deleted file mode 100644
index 84a545d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_1.j
+++ /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_lastore_1.java
-.class public dxc/junit/opcodes/lastore/jm/T_lastore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([JIJ)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    iload_2
-    lload_3
-    lastore
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_1.java
deleted file mode 100644
index 1b99d7e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_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 dxc.junit.opcodes.lastore.jm;
-
-public class T_lastore_1 {
-
-    public void run(long[] arr, int idx, long value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_2.j
deleted file mode 100644
index e390ddc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_2.j
+++ /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_lastore_2.java
-.class public dxc/junit/opcodes/lastore/jm/T_lastore_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run([JIJ)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    iload_2
-;    lload_3
-    lastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_2.java
deleted file mode 100644
index 5ffe95a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_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 dxc.junit.opcodes.lastore.jm;
-
-public class T_lastore_2 {
-
-    public void run(long[] arr, int idx, long value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_3.j
deleted file mode 100644
index c99fb54..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_3.j
+++ /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_lastore_3.java
-.class public dxc/junit/opcodes/lastore/jm/T_lastore_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run([JIJ)V
-    .limit stack 4
-    .limit locals 5
-
-;    aload_1
-    iload_2
-    lload_3
-    lastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_3.java
deleted file mode 100644
index 49f5b9f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_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 dxc.junit.opcodes.lastore.jm;
-
-public class T_lastore_3 {
-
-    public void run(long[] arr, int idx, long value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_4.j
deleted file mode 100644
index 0ad73cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_4.j
+++ /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_lastore_4.java
-.class public dxc/junit/opcodes/lastore/jm/T_lastore_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run([JDJ)V
-    .limit stack 5
-    .limit locals 6
-
-    aload_1
-    dload_2
-;    d2i
-    lload 4
-    lastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_4.java
deleted file mode 100644
index d18b82f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_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 dxc.junit.opcodes.lastore.jm;
-
-public class T_lastore_4 {
-
-    public void run(long[] arr, double idx, long value) {
-        arr[(int)idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_5.j
deleted file mode 100644
index 8c2ffd3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_5.j
+++ /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_lastore_5.java
-.class public dxc/junit/opcodes/lastore/jm/T_lastore_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run([JII)V
-    .limit stack 4
-    .limit locals 4
-    
-    aload_1
-    iload_2
-    iload_3
-;    i2l
-    lastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_5.java
deleted file mode 100644
index 091def6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_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 dxc.junit.opcodes.lastore.jm;
-
-public class T_lastore_5 {
-
-    public void run(long[] arr, int idx, int value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_6.j
deleted file mode 100644
index 0b74d34..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_6.j
+++ /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_lastore_6.java
-.class public dxc/junit/opcodes/lastore/jm/T_lastore_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run(Ljava/lang/Object;[JIJ)V
-    .limit stack 4
-    .limit locals 6
-
-    aload_1
-    iload_3
-    lload 4
-    lastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_6.java
deleted file mode 100644
index 8fd85cc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_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 dxc.junit.opcodes.lastore.jm;
-
-public class T_lastore_6 {
-
-    public void run(Object a, long[] arr, int idx, long value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_7.j b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_7.j
deleted file mode 100644
index fbd9554..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_7.j
+++ /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_lastore_7.java
-.class public dxc/junit/opcodes/lastore/jm/T_lastore_7
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run([D[JIJ)V
-    .limit stack 4
-    .limit locals 6
-
-    aload_1
-    iload_3
-    lload 4
-    lastore
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_7.java b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_7.java
deleted file mode 100644
index f878359..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_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 dxc.junit.opcodes.lastore.jm;
-
-public class T_lastore_7 {
-    
-    public void run(double[] a, long[] arr, int idx, long value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_8.j b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_8.j
deleted file mode 100644
index abde74c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_8.j
+++ /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_lastore_8.java
-.class public dxc/junit/opcodes/lastore/jm/T_lastore_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run([I[JIJ)V
-    .limit stack 4
-    .limit locals 6
-
-    aload_1
-    iload_3
-    lload 4
-    lastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_8.java b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_8.java
deleted file mode 100644
index 21de247..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_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 dxc.junit.opcodes.lastore.jm;
-
-public class T_lastore_8 {
-    
-    public void run(int[] a, long[] arr, int idx, long value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_9.j b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_9.j
deleted file mode 100644
index dd05a54..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_9.j
+++ /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_lastore_9.java
-.class public dxc/junit/opcodes/lastore/jm/T_lastore_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([JIJ)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    aload_0
-    lload_3
-    lastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_9.java b/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_9.java
deleted file mode 100644
index 2cc91fb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lastore/jm/T_lastore_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 dxc.junit.opcodes.lastore.jm;
-
-public class T_lastore_9 {
-    
-    public void run(long[] arr, int idx, long value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/Test_lcmp.java b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/Test_lcmp.java
deleted file mode 100644
index 7a5e66a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/Test_lcmp.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 dxc.junit.opcodes.lcmp;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lcmp.jm.T_lcmp_1;
-
-public class Test_lcmp extends DxTestCase {
-
-    /**
-     * @title  Arguments = 111234567891l > 111234567890l
-     */
-    public void testN1() {
-        T_lcmp_1 t = new T_lcmp_1();
-        assertEquals(1, t.run(111234567891l, 111234567890l));
-    }
-
-    /**
-     * @title  Arguments = 112234567890 == 112234567890
-     */
-    public void testN2() {
-        T_lcmp_1 t = new T_lcmp_1();
-        assertEquals(0, t.run(112234567890l, 112234567890l));
-    }
-
-    /**
-     * @title  Arguments = 112234567890 < 998876543210
-     */
-    public void testN3() {
-        T_lcmp_1 t = new T_lcmp_1();
-        assertEquals(-1, t.run(112234567890l, 998876543210l));
-    }
-
-    /**
-     * @title  Arguments = Long.MAX_VALUE > Long.MIN_VALUE
-     */
-    public void testB1() {
-        T_lcmp_1 t = new T_lcmp_1();
-        assertEquals(1, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Long.MIN_VALUE < Long.MAX_VALUE
-     */
-    public void testB2() {
-        T_lcmp_1 t = new T_lcmp_1();
-        assertEquals(-1, t.run(Long.MIN_VALUE, Long.MAX_VALUE));
-    }
-
-    /**
-     * @title  Arguments = 1 > 0
-     */
-    public void testB3() {
-        T_lcmp_1 t = new T_lcmp_1();
-        assertEquals(1, t.run(1l, 0l));
-    }
-
-    /**
-     * @title  Arguments = 0 > -1
-     */
-    public void testB4() {
-        T_lcmp_1 t = new T_lcmp_1();
-        assertEquals(1, t.run(0l, -1l));
-    }
-
-    /**
-     * @title  Arguments = -1 < 0
-     */
-    public void testB5() {
-        T_lcmp_1 t = new T_lcmp_1();
-        assertEquals(-1, t.run(-1l, 0l));
-    }
-
-    /**
-     * @title  Arguments = 0 = 0
-     */
-    public void testB6() {
-        T_lcmp_1 t = new T_lcmp_1();
-        assertEquals(0, t.run(0l, 0l));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lcmp.jm.T_lcmp_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lcmp.jm.T_lcmp_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lcmp.jm.T_lcmp_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lcmp.jm.T_lcmp_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, long
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lcmp.jm.T_lcmp_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_1.j
deleted file mode 100644
index a37867b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_1.j
+++ /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 T_lcmp_1.java
-.class public dxc/junit/opcodes/lcmp/jm/T_lcmp_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run(JJ)I
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    lload_3
-    
-    lcmp
-    ifle Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    
-    lload_1
-    lload_3
-    
-    lcmp
-    ifne Label1
-    iconst_0
-    ireturn
-
-    Label1:
-
-    iconst_m1
-
-    Label3:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_1.java
deleted file mode 100644
index 648eef6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_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 dxc.junit.opcodes.lcmp.jm;
-
-public class T_lcmp_1 {
-
-    public int run(long a, long b) {
-        if (a > b)   return 1;
-        if (a == b)  return 0;
-        return -1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_2.j
deleted file mode 100644
index 30e358f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_2.j
+++ /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_lcmp_2.java
-.class public dxc/junit/opcodes/lcmp/jm/T_lcmp_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-.method public run(JJ)I
-    .limit stack 4
-    .limit locals 5
-
-;    lload_1
-    lload_3
-    lcmp
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_2.java
deleted file mode 100644
index 9443337..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_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 dxc.junit.opcodes.lcmp.jm;
-
-public class T_lcmp_2 {
-
-    public int run(long a, long b) {
-        if (a > b)   return 1;
-        if (a == b)  return 0;
-        return -1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_3.j
deleted file mode 100644
index 16498e2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_3.j
+++ /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_lcmp_3.java
-.class public dxc/junit/opcodes/lcmp/jm/T_lcmp_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JD)Z
-    .limit stack 4
-    .limit locals 5
-    
-    lload_1
-    dload_3
-;    d2l
-    lcmp
-
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_3.java
deleted file mode 100644
index 6c560b8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_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 dxc.junit.opcodes.lcmp.jm;
-
-public class T_lcmp_3 {
-
-    public boolean run(long a, double b) {
-        return  a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_4.j
deleted file mode 100644
index 01d5862..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_4.j
+++ /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_lcmp_4.java
-.class public dxc/junit/opcodes/lcmp/jm/T_lcmp_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FJ)Z
-    .limit stack 3
-    .limit locals 4
-    
-    fload_1
-;    f2l    
-    lload_2
-    lcmp
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_4.java
deleted file mode 100644
index 610f55c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_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 dxc.junit.opcodes.lcmp.jm;
-
-public class T_lcmp_4 {
-
-    public boolean run(float a, long b) {
-        return  a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_5.j
deleted file mode 100644
index e726534..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_5.j
+++ /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_lcmp_5.java
-.class public dxc/junit/opcodes/lcmp/jm/T_lcmp_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(IJ)Z
-    .limit stack 4
-    .limit locals 4
-
-    iload_1
-;    i2l
-    lload_2
-    lcmp
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_5.java
deleted file mode 100644
index 3e6e5a5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_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 dxc.junit.opcodes.lcmp.jm;
-
-public class T_lcmp_5 {
-
-    public boolean run(int a, long b) {
-        return  a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_6.j
deleted file mode 100644
index 115621e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_6.j
+++ /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_lcmp_6.java
-.class public dxc/junit/opcodes/lcmp/jm/T_lcmp_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(IJ)Z
-    .limit stack 4
-    .limit locals 4
-
-    aload_0
-    lload_2
-    lcmp
-    ifle Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_6.java
deleted file mode 100644
index bd3b599..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lcmp/jm/T_lcmp_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 dxc.junit.opcodes.lcmp.jm;
-
-public class T_lcmp_6 {
-
-    public boolean run(int a, long b) {
-        return  a > b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/Test_lconst_0.java b/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/Test_lconst_0.java
deleted file mode 100644
index 7da9440..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/Test_lconst_0.java
+++ /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.
- */
-
-package dxc.junit.opcodes.lconst_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lconst_0.jm.T_lconst_0_1;
-
-public class Test_lconst_0 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_lconst_0_1 t = new T_lconst_0_1();
-        long a = 20l;
-        long b = 20l;
-        assertEquals(a - b, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lconst_0.jm.T_lconst_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_1.j
deleted file mode 100644
index 615936c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lconst_0_1.java
-.class public dxc/junit/opcodes/lconst_0/jm/T_lconst_0_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 2
-    .limit locals 1
-
-    lconst_0
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_1.java
deleted file mode 100644
index 6d20fef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_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 dxc.junit.opcodes.lconst_0.jm;
-
-public class T_lconst_0_1 {
-
-    public long run() {
-        return 0l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_2.j
deleted file mode 100644
index 2290ece..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_2.j
+++ /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_lconst_0_2.java
-.class public dxc/junit/opcodes/lconst_0/jm/T_lconst_0_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 2
-    .limit locals 1
-
-    lconst_0
-    lconst_0
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_2.java
deleted file mode 100644
index 251f700..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lconst_0/jm/T_lconst_0_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 dxc.junit.opcodes.lconst_0.jm;
-
-public class T_lconst_0_2 {
-
-    public long run() {
-        return 0l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/Test_lconst_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/Test_lconst_1.java
deleted file mode 100644
index f486fe8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/Test_lconst_1.java
+++ /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.
- */
-
-package dxc.junit.opcodes.lconst_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lconst_1.jm.T_lconst_1_1;
-
-public class Test_lconst_1 extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_lconst_1_1 t = new T_lconst_1_1();
-        long a = 20l;
-        long b = 19l;
-        assertEquals(a - b, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lconst_1.jm.T_lconst_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_1.j
deleted file mode 100644
index 3a476e7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_1.j
+++ /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_lconst_1_1.java
-.class public dxc/junit/opcodes/lconst_1/jm/T_lconst_1_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 2
-    .limit locals 1
-    
-    lconst_1
-    lreturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_1.java
deleted file mode 100644
index f6d01f2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_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 dxc.junit.opcodes.lconst_1.jm;
-
-public class T_lconst_1_1 {
-
-    public long run() {
-        return 1l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_2.j
deleted file mode 100644
index 2be8208..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_2.j
+++ /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_lconst_1_2.java
-.class public dxc/junit/opcodes/lconst_1/jm/T_lconst_1_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 2
-    .limit locals 1
-
-    lconst_1
-    lconst_1
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_2.java
deleted file mode 100644
index 62d1019..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lconst_1/jm/T_lconst_1_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 dxc.junit.opcodes.lconst_1.jm;
-
-public class T_lconst_1_2 {
-
-    public long run() {
-        return 1l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/Test_ldc.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc/Test_ldc.java
deleted file mode 100644
index d83462b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/Test_ldc.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.ldc;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ldc.jm.T_ldc_1;
-import dxc.junit.opcodes.ldc.jm.T_ldc_2;
-import dxc.junit.opcodes.ldc.jm.T_ldc_3;
-
-public class Test_ldc extends DxTestCase {
-
-    /**
-     * @title push string into stack
-     */
-    public void testN1() {
-        T_ldc_1 t = new T_ldc_1();
-        // lcd is hard to test isolated
-        String res = t.run();
-        assertEquals(5, res.length());
-        assertEquals('h', res.charAt(0));
-    }
-
-    /**
-     * @title push float into stack
-     */
-    public void testN2() {
-        T_ldc_2 t = new T_ldc_2();
-        float a = 1.5f;
-        float b = 0.04f;
-        assertEquals(a + b, t.run(), 0f);
-        assertEquals(1.54f, t.run(), 0f);
-    }
-
-    /**
-     * @title push int into stack
-     */
-    public void testN3() {
-        T_ldc_3 t = new T_ldc_3();
-        int a = 1000000000;
-        int b = 1000000000;
-        assertEquals(a + b, t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.10
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldc.jm.T_ldc_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.10
-     * @title wrong constant pool entry type (long)
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldc.jm.T_ldc_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_1.j
deleted file mode 100644
index 1b9571e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_1.j
+++ /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_ldc_1.java
-.class public dxc/junit/opcodes/ldc/jm/T_ldc_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Ljava/lang/String;
-    ldc "hello"
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_1.java
deleted file mode 100644
index 1c1d9ed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_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 dxc.junit.opcodes.ldc.jm;
-
-public class T_ldc_1 {
-
-    public String run() {
-        return "hello";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_2.j
deleted file mode 100644
index 65f5222..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_2.j
+++ /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_ldc_2.java
-.class public dxc/junit/opcodes/ldc/jm/T_ldc_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()F
-    ldc 1.54
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_2.java
deleted file mode 100644
index 771174a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_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 dxc.junit.opcodes.ldc.jm;
-
-public class T_ldc_2 {
-
-    public float run() {
-        return 1.54f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_3.j
deleted file mode 100644
index 08731e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_3.j
+++ /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_ldc_3.java
-.class public dxc/junit/opcodes/ldc/jm/T_ldc_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    ldc 2000000000
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_3.java
deleted file mode 100644
index 5dbec3f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_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 dxc.junit.opcodes.ldc.jm;
-
-public class T_ldc_3 {
-
-    public int run() {
-        return 2000000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_4.cfh
deleted file mode 100644
index ea05bc1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_4.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/opcodes/ldc/jm/T_ldc_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000f
-// .  .  
-   00 0f 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 5, h: 0004: int{0x00003039 / 12345}
-    // .  .  .  0  9  
-       03 00 00 30 39 
-    // parsed:, offset 52, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 61, len 6, h: 0006: utf8{"()I"}
-    // .  .  .  (  )  I  
-       01 00 03 28 29 49 
-    // parsed:, offset 67, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 73, len 3, h: 0008: type{dxc.junit.opcodes.ldc.jm.T_ldc_4}
-    // .  .  .  
-       07 00 0d 
-    // parsed:, offset 76, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 81, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 88, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 94, len 15, h: 000c: utf8{"T_ldc_4.java"}
-    // .  .  .  T  _  l  d  c  _  4  .  j  a  v  a  
-       01 00 0c 54 5f 6c 64 63 5f 34 2e 6a 61 76 61 
-    // parsed:, offset 109, len 35, h: 000d: utf8{"dxc/junit/opcodes/ldc/jm/T_ldc_4"}
-    // .  .     d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  d  c  /  j  m  /  T  _  l  d  c  _  4  
-       01 00 20 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 64 63 2f 6a 6d 2f 54 5f 6c 64 63 5f 34 
-    // parsed:, offset 144, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 147, len 0, h: end constant_pool
-// parsed:, offset 147, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 149, len 2, h: this_class: type{dxc.junit.opcodes.ldc.jm.T_ldc_4}
-// .  .  
-   00 08 
-// parsed:, offset 151, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 153, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 155, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 157, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 159, len:70,desc: ()V
-// parsed:, offset 159, len 0, h:  methods[0]: 
-    // parsed:, offset 159, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 161, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 163, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 165, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 167, len 0, h:  attributes[0]: 
-        // parsed:, offset 167, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 169, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 173, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 175, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 177, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 186, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 188, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 190, len 0, h: end attributes[0] 
-// parsed:, offset 190, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 190, len:39,desc: ()I
-// parsed:, offset 190, len 0, h:  methods[1]: 
-    // parsed:, offset 190, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 192, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 194, len 2, h: descriptor: ()I
-    // .  .  
-       00 06 
-    // parsed:, offset 196, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 198, len 0, h:  attributes[0]: 
-        // parsed:, offset 198, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 200, len 4, h: length: 0000000f
-        // .  .  .  .  
-           00 00 00 0f 
-        // parsed:, offset 204, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 206, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 208, len 4, h: code_length: 00000003
-        // .  .  .  .  
-           00 00 00 03 
-        // parsed:, offset 0, len 2, h: 0000: ldc #+00003039
-        // .  .  
-//@mod           12 04 
-           12 14 
-        // parsed:, offset 2, len 1, h: 0002: ireturn
-        // .  
-           ac 
-        // parsed:, offset 215, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 217, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 219, len 0, h: end attributes[0] 
-// parsed:, offset 219, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()I
-// parsed:, offset 219, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 221, len 0, h:  attributes[0]: 
-    // parsed:, offset 221, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 223, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 227, len 2, h: source: utf8{"T_ldc_4.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 229, len 0, h: end attributes[0] 
-// parsed:, offset 229, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_4.j
deleted file mode 100644
index 9d121ea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_4.j
+++ /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_ldc_4.java
-.class public dxc/junit/opcodes/ldc/jm/T_ldc_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 2
-
-    ldc 12345
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_4.java
deleted file mode 100644
index e66c022..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_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 dxc.junit.opcodes.ldc.jm;
-
-public class T_ldc_4 {
-
-    public int run() {
-        return 12345;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_5.cfh
deleted file mode 100644
index a56ea0a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/ldc/jm/T_ldc_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0011
-// .  .  
-   00 11 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 0a 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 15, h: 0003: utf8{"T_ldc_5.java"}
-    // .  .  .  T  _  l  d  c  _  5  .  j  a  v  a  
-       01 00 0c 54 5f 6c 64 63 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 49, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 62, len 5, h: 0005: int{0x00003039 / 12345}
-    // .  .  .  0  9  
-       03 00 00 30 39 
-    // parsed:, offset 67, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 76, len 6, h: 0007: utf8{"()I"}
-    // .  .  .  (  )  I  
-       01 00 03 28 29 49 
-    // parsed:, offset 82, len 3, h: 0008: type{dxc.junit.opcodes.ldc.jm.T_ldc_5}
-    // .  .  .  
-       07 00 0d 
-    // parsed:, offset 85, len 6, h: 0009: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 91, len 5, h: 000a: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0c 
-    // parsed:, offset 96, len 7, h: 000b: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 103, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 109, len 35, h: 000d: utf8{"dxc/junit/opcodes/ldc/jm/T_ldc_5"}
-    // .  .     d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  d  c  /  j  m  /  T  _  l  d  c  _  5  
-       01 00 20 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 64 63 2f 6a 6d 2f 54 5f 6c 64 63 5f 35 
-    // parsed:, offset 144, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 147, len 9, h: 000f: long{0x0000000000003039 / 12345}
-    // .  .  .  .  .  .  .  0  9  
-       05 00 00 00 00 00 00 30 39 
-// parsed:, offset 156, len 0, h: end constant_pool
-// parsed:, offset 156, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 158, len 2, h: this_class: type{dxc.junit.opcodes.ldc.jm.T_ldc_5}
-// .  .  
-   00 08 
-// parsed:, offset 160, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 162, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 164, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 166, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 168, len:74,desc: ()V
-// parsed:, offset 168, len 0, h:  methods[0]: 
-    // parsed:, offset 168, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 170, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 172, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 174, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 0, h:  attributes[0]: 
-        // parsed:, offset 176, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 178, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 182, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 184, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 186, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 195, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 197, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 199, len 0, h: end attributes[0] 
-// parsed:, offset 199, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 199, len:43,desc: ()I
-// parsed:, offset 199, len 0, h:  methods[1]: 
-    // parsed:, offset 199, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 201, len 2, h: name: run
-    // .  .  
-       00 09 
-    // parsed:, offset 203, len 2, h: descriptor: ()I
-    // .  .  
-       00 07 
-    // parsed:, offset 205, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 0, h:  attributes[0]: 
-        // parsed:, offset 207, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 209, len 4, h: length: 00000013
-        // .  .  .  .  
-           00 00 00 13 
-        // parsed:, offset 213, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 215, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 217, len 4, h: code_length: 00000007
-        // .  .  .  .  
-           00 00 00 07 
-        // parsed:, offset 0, len 3, h: 0000: ldc2_w #+0000000000003039
-        // .  .  .  
-           14 00 0f 
-        // parsed:, offset 3, len 1, h: 0003: pop2
-        // X  
-           58 
-        // parsed:, offset 4, len 2, h: 0004: ldc #+00003039
-        // .  .  
-//@mod           12 05 
-           12 0f 
-        // parsed:, offset 6, len 1, h: 0006: ireturn
-        // .  
-           ac 
-        // parsed:, offset 228, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 230, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 232, len 0, h: end attributes[0] 
-// parsed:, offset 232, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()I
-// parsed:, offset 232, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 234, len 0, h:  attributes[0]: 
-    // parsed:, offset 234, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 236, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 240, len 2, h: source: utf8{"T_ldc_5.java"}
-    // .  .  
-       00 03 
-// parsed:, offset 242, len 0, h: end attributes[0] 
-// parsed:, offset 242, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_5.j
deleted file mode 100644
index 5640bdfc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ldc_5.java
-.class public dxc/junit/opcodes/ldc/jm/T_ldc_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 2
-
-    ldc2_w 12345
-    pop2
-    ldc 12345
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_5.java
deleted file mode 100644
index 8507910..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc/jm/T_ldc_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 dxc.junit.opcodes.ldc.jm;
-
-public class T_ldc_5 {
-
-    public int run() {
-        return 12345;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/Test_ldc2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/Test_ldc2_w.java
deleted file mode 100644
index 0ad5ca8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/Test_ldc2_w.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 dxc.junit.opcodes.ldc2_w;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ldc2_w.jm.T_ldc2_w_1;
-import dxc.junit.opcodes.ldc2_w.jm.T_ldc2_w_2;
-
-public class Test_ldc2_w extends DxTestCase {
-
-    /**
-     * @title push long into stack
-     */
-    public void testN1() {
-        T_ldc2_w_1 t = new T_ldc2_w_1();
-        long a = 1234567890122l;
-        long b = 1l;
-        assertEquals(a + b, t.run());
-    }
-
-    /**
-     * @title push double into stack
-     */
-    public void testN2() {
-        T_ldc2_w_2 t = new T_ldc2_w_2();
-        double a = 1234567890123232323232232323232323232323232323456788d;
-        double b = 1d;
-        assertEquals(a + b, t.run(), 0d);
-    }
-
-    /**
-     * @constraint 4.8.1.10
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldc2_w.jm.T_ldc2_w_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.10
-     * @title wrong constant pool entry type (float)
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldc2_w.jm.T_ldc2_w_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_1.j
deleted file mode 100644
index 35ca464..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_1.j
+++ /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_ldc2_w_1.java
-.class public dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()J
-    .limit stack 2
-    .limit locals 1
-    ldc2_w 1234567890123
-    lreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_1.java
deleted file mode 100644
index 101a0ac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_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 dxc.junit.opcodes.ldc2_w.jm;
-
-public class T_ldc2_w_1 {
-
-    public long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_2.j
deleted file mode 100644
index cbca295..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_2.j
+++ /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_ldc2_w_2.java
-.class public dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()D
-    .limit stack 2
-    .limit locals 1
-    ldc2_w 1.2345678901232324E51
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_2.java
deleted file mode 100644
index bdc6ed9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_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 dxc.junit.opcodes.ldc2_w.jm;
-
-public class T_ldc2_w_2 {
-
-    public double run() {
-        return 1234567890123232323232232323232323232323232323456789d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4.cfh
deleted file mode 100644
index cf6919f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0010
-// .  .  
-   00 10 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 06 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0c 
-    // parsed:, offset 67, len 6, h: 0007: utf8{"()D"}
-    // .  .  .  (  )  D  
-       01 00 03 28 29 44 
-    // parsed:, offset 73, len 3, h: 0008: type{dxc.junit.opcodes.ldc2_w.jm.T_ldc2_w_4}
-    // .  .  .  
-       07 00 0f 
-    // parsed:, offset 76, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 83, len 9, h: 000a: double{0x40091eb860000000 / 3.140000104904175}
-    // .  @  .  .  .  `  .  .  .  
-       06 40 09 1e b8 60 00 00 00 
-    // parsed:, offset 92, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 98, len 18, h: 000d: utf8{"T_ldc2_w_4.java"}
-    // .  .  .  T  _  l  d  c  2  _  w  _  4  .  j  a  v  a  
-       01 00 0f 54 5f 6c 64 63 32 5f 77 5f 34 2e 6a 61 76 61 
-    // parsed:, offset 116, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 119, len 41, h: 000f: utf8{"dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4"}
-    // .  .  &  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  d  c  2  _  w  /  j  m  /  T  _  l  d  c  2  _  w  _  4  
-       01 00 26 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 64 63 32 5f 77 2f 6a 6d 2f 54 5f 6c 64 63 32 5f 77 5f 34 
-// parsed:, offset 160, len 0, h: end constant_pool
-// parsed:, offset 160, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 162, len 2, h: this_class: type{dxc.junit.opcodes.ldc2_w.jm.T_ldc2_w_4}
-// .  .  
-   00 08 
-// parsed:, offset 164, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 166, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 168, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 172, len:71,desc: ()V
-// parsed:, offset 172, len 0, h:  methods[0]: 
-    // parsed:, offset 172, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 174, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 176, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 178, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 180, len 0, h:  attributes[0]: 
-        // parsed:, offset 180, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 182, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 186, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 188, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 199, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 201, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 203, len 0, h: end attributes[0] 
-// parsed:, offset 203, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 203, len:40,desc: ()D
-// parsed:, offset 203, len 0, h:  methods[1]: 
-    // parsed:, offset 203, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 205, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 207, len 2, h: descriptor: ()D
-    // .  .  
-       00 07 
-    // parsed:, offset 209, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 211, len 0, h:  attributes[0]: 
-        // parsed:, offset 211, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 213, len 4, h: length: 00000010
-        // .  .  .  .  
-           00 00 00 10 
-        // parsed:, offset 217, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 219, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 221, len 4, h: code_length: 00000004
-        // .  .  .  .  
-           00 00 00 04 
-        // parsed:, offset 0, len 3, h: 0000: ldc2_w #40091eb860000000 // 3.140000104904175
-        // .  .  .  
-//@mod           14 00 0a 
-           14 01 0a 
-        // parsed:, offset 3, len 1, h: 0003: dreturn
-        // .  
-           af 
-        // parsed:, offset 229, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 231, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 233, len 0, h: end attributes[0] 
-// parsed:, offset 233, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()D
-// parsed:, offset 233, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 235, len 0, h:  attributes[0]: 
-    // parsed:, offset 235, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 237, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 241, len 2, h: source: utf8{"T_ldc2_w_4.java"}
-    // .  .  
-       00 0d 
-// parsed:, offset 243, len 0, h: end attributes[0] 
-// parsed:, offset 243, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4.j
deleted file mode 100644
index c3dc2d5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4.j
+++ /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_ldc2_w_4.java
-.class public dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()D
-    .limit stack 2
-
-    ldc2_w 3.14
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_4.java
deleted file mode 100644
index f6d7d17..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_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 dxc.junit.opcodes.ldc2_w.jm;
-
-public class T_ldc2_w_4 {
-
-    public double run() {
-        return 3.14d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5.cfh
deleted file mode 100644
index 0a5eb37..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0011
-// .  .  
-   00 11 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 10 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 18, h: 0004: utf8{"T_ldc2_w_5.java"}
-    // .  .  .  T  _  l  d  c  2  _  w  _  5  .  j  a  v  a  
-       01 00 0f 54 5f 6c 64 63 32 5f 77 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 65, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 74, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 80, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0d 
-    // parsed:, offset 85, len 3, h: 0008: type{dxc.junit.opcodes.ldc2_w.jm.T_ldc2_w_5}
-    // .  .  .  
-       07 00 0f 
-    // parsed:, offset 88, len 6, h: 0009: utf8{"()D"}
-    // .  .  .  (  )  D  
-       01 00 03 28 29 44 
-    // parsed:, offset 94, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 101, len 9, h: 000b: double{0x40091eb860000000 / 3.140000104904175}
-    // .  @  .  .  .  `  .  .  .  
-       06 40 09 1e b8 60 00 00 00 
-    // parsed:, offset 110, len 6, h: 000d: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 116, len 5, h: 000e: float{0x4048f5c3 / 3.14}
-    // .  @  H  .  .  
-       04 40 48 f5 c3 
-    // parsed:, offset 121, len 41, h: 000f: utf8{"dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5"}
-    // .  .  &  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  d  c  2  _  w  /  j  m  /  T  _  l  d  c  2  _  w  _  5  
-       01 00 26 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 64 63 32 5f 77 2f 6a 6d 2f 54 5f 6c 64 63 32 5f 77 5f 35 
-    // parsed:, offset 162, len 3, h: 0010: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 165, len 0, h: end constant_pool
-// parsed:, offset 165, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 167, len 2, h: this_class: type{dxc.junit.opcodes.ldc2_w.jm.T_ldc2_w_5}
-// .  .  
-   00 08 
-// parsed:, offset 169, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 10 
-// parsed:, offset 171, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 173, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 175, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 177, len:74,desc: ()V
-// parsed:, offset 177, len 0, h:  methods[0]: 
-    // parsed:, offset 177, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 179, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 181, len 2, h: descriptor: ()V
-    // .  .  
-       00 0d 
-    // parsed:, offset 183, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 185, len 0, h:  attributes[0]: 
-        // parsed:, offset 185, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 187, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 191, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 193, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 195, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 204, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 206, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 208, len 0, h: end attributes[0] 
-// parsed:, offset 208, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 208, len:43,desc: ()D
-// parsed:, offset 208, len 0, h:  methods[1]: 
-    // parsed:, offset 208, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 210, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 212, len 2, h: descriptor: ()D
-    // .  .  
-       00 09 
-    // parsed:, offset 214, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 216, len 0, h:  attributes[0]: 
-        // parsed:, offset 216, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 218, len 4, h: length: 00000013
-        // .  .  .  .  
-           00 00 00 13 
-        // parsed:, offset 222, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 224, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 4, h: code_length: 00000007
-        // .  .  .  .  
-           00 00 00 07 
-        // parsed:, offset 0, len 2, h: 0000: ldc #4048f5c3 // 3.14
-        // .  .  
-           12 0e 
-        // parsed:, offset 2, len 1, h: 0002: pop
-        // W  
-           57 
-        // parsed:, offset 3, len 3, h: 0003: ldc2_w #40091eb860000000 // 3.140000104904175
-        // .  .  .  
-//@mod           14 00 0b 
-           14 00 0e 
-        // parsed:, offset 6, len 1, h: 0006: dreturn
-        // .  
-           af 
-        // parsed:, offset 237, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 239, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 241, len 0, h: end attributes[0] 
-// parsed:, offset 241, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()D
-// parsed:, offset 241, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 243, len 0, h:  attributes[0]: 
-    // parsed:, offset 243, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 245, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 249, len 2, h: source: utf8{"T_ldc2_w_5.java"}
-    // .  .  
-       00 04 
-// parsed:, offset 251, len 0, h: end attributes[0] 
-// parsed:, offset 251, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5.j
deleted file mode 100644
index 4001c60..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5.j
+++ /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_ldc2_w_5.java
-.class public dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()D
-    .limit stack 2
-
-    ldc 3.14
-    pop
-
-    ldc2_w 3.14
-    dreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_5.java
deleted file mode 100644
index 3c49374..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc2_w/jm/T_ldc2_w_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 dxc.junit.opcodes.ldc2_w.jm;
-
-public class T_ldc2_w_5 {
-
-    public double run() {
-        return 3.14d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/Test_ldc_w.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/Test_ldc_w.java
deleted file mode 100644
index 2be1dac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/Test_ldc_w.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 dxc.junit.opcodes.ldc_w;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ldc_w.jm.T_ldc_w_1;
-import dxc.junit.opcodes.ldc_w.jm.T_ldc_w_2;
-
-public class Test_ldc_w extends DxTestCase {
-
-    /**
-     * @title push float into stack
-     */
-    public void testN1() {
-        T_ldc_w_1 t = new T_ldc_w_1();
-        float a = 1.5f;
-        float b = 0.04f;
-        assertEquals(a + b, t.run(), 0f);
-        assertEquals(1.54f, t.run(), 0f);
-    }
-
-    /**
-     * @title push int into stack
-     */
-    public void testN2() {
-        T_ldc_w_2 t = new T_ldc_w_2();
-        int a = 1000000000;
-        int b = 1000000000;
-        assertEquals(a + b, t.run());
-    }
-
-
-    /**
-     * @constraint 4.8.1.10
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldc_w.jm.T_ldc_w_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.10
-     * @title wrong constant pool entry type
-     * (double)
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldc_w.jm.T_ldc_w_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_1.j
deleted file mode 100644
index 532bb69..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_1.j
+++ /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_ldc_w_1.java
-.class public dxc/junit/opcodes/ldc_w/jm/T_ldc_w_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()F
-    ldc_w 1.54
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_1.java
deleted file mode 100644
index d877227..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_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 dxc.junit.opcodes.ldc_w.jm;
-
-public class T_ldc_w_1 {
-    
-    public float run(){
-        return 1.54f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_2.j
deleted file mode 100644
index b3f0bc3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_2.j
+++ /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_ldc_w_2.java
-.class public dxc/junit/opcodes/ldc_w/jm/T_ldc_w_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    ldc_w 2000000000
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_2.java
deleted file mode 100644
index 451fa71..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_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 dxc.junit.opcodes.ldc_w.jm;
-
-public class T_ldc_w_2 {
-
-    public int run() {
-        return 2000000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4.cfh
deleted file mode 100644
index 343bc75..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000f
-// .  .  
-   00 0f 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 17, h: 0001: utf8{"T_ldc_w_4.java"}
-    // .  .  .  T  _  l  d  c  _  w  _  4  .  j  a  v  a  
-       01 00 0e 54 5f 6c 64 63 5f 77 5f 34 2e 6a 61 76 61 
-    // parsed:, offset 27, len 5, h: 0002: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 08 
-    // parsed:, offset 32, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 51, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 64, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 73, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 79, len 6, h: 0007: utf8{"()F"}
-    // .  .  .  (  )  F  
-       01 00 03 28 29 46 
-    // parsed:, offset 85, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0a 
-    // parsed:, offset 90, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 97, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 103, len 5, h: 000b: float{0x4048f5c3 / 3.14}
-    // .  @  H  .  .  
-       04 40 48 f5 c3 
-    // parsed:, offset 108, len 39, h: 000c: utf8{"dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4"}
-    // .  .  $  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  d  c  _  w  /  j  m  /  T  _  l  d  c  _  w  _  4  
-       01 00 24 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 64 63 5f 77 2f 6a 6d 2f 54 5f 6c 64 63 5f 77 5f 34 
-    // parsed:, offset 147, len 3, h: 000d: type{dxc.junit.opcodes.ldc_w.jm.T_ldc_w_4}
-    // .  .  .  
-       07 00 0c 
-    // parsed:, offset 150, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 153, len 0, h: end constant_pool
-// parsed:, offset 153, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 155, len 2, h: this_class: type{dxc.junit.opcodes.ldc_w.jm.T_ldc_w_4}
-// .  .  
-   00 0d 
-// parsed:, offset 157, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 159, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 161, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 163, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 165, len:71,desc: ()V
-// parsed:, offset 165, len 0, h:  methods[0]: 
-    // parsed:, offset 165, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 167, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 169, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 171, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 173, len 0, h:  attributes[0]: 
-        // parsed:, offset 173, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 175, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 179, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 181, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 183, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 02 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 192, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 194, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 196, len 0, h: end attributes[0] 
-// parsed:, offset 196, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 196, len:40,desc: ()F
-// parsed:, offset 196, len 0, h:  methods[1]: 
-    // parsed:, offset 196, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 198, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 200, len 2, h: descriptor: ()F
-    // .  .  
-       00 07 
-    // parsed:, offset 202, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 204, len 0, h:  attributes[0]: 
-        // parsed:, offset 204, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 206, len 4, h: length: 00000010
-        // .  .  .  .  
-           00 00 00 10 
-        // parsed:, offset 210, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 212, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 214, len 4, h: code_length: 00000004
-        // .  .  .  .  
-           00 00 00 04 
-        // parsed:, offset 0, len 3, h: 0000: ldc_w #4048f5c3 // 3.14
-        // .  .  .  
-//@mod           13 00 0b 
-           13 01 0b 
-        // parsed:, offset 3, len 1, h: 0003: freturn
-        // .  
-           ae 
-        // parsed:, offset 222, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 224, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 226, len 0, h: end attributes[0] 
-// parsed:, offset 226, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()F
-// parsed:, offset 226, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 228, len 0, h:  attributes[0]: 
-    // parsed:, offset 228, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 230, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 234, len 2, h: source: utf8{"T_ldc_w_4.java"}
-    // .  .  
-       00 01 
-// parsed:, offset 236, len 0, h: end attributes[0] 
-// parsed:, offset 236, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4.j
deleted file mode 100644
index f978b5e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4.j
+++ /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_ldc_w_4.java
-.class public dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()F
-    ldc_w 3.14f
-    freturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_4.java
deleted file mode 100644
index 75eef74..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_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 dxc.junit.opcodes.ldc_w.jm;
-
-public class T_ldc_w_4 {
-
-    public float run(String a){
-        return 3.14f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5.cfh
deleted file mode 100644
index ecfe634..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0011
-// .  .  
-   00 11 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 10 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 17, h: 0006: utf8{"T_ldc_w_5.java"}
-    // .  .  .  T  _  l  d  c  _  w  _  5  .  j  a  v  a  
-       01 00 0e 54 5f 6c 64 63 5f 77 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 79, len 6, h: 0007: utf8{"()F"}
-    // .  .  .  (  )  F  
-       01 00 03 28 29 46 
-    // parsed:, offset 85, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0c 
-    // parsed:, offset 90, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 97, len 9, h: 000a: double{0x40091eb860000000 / 3.140000104904175}
-    // .  @  .  .  .  `  .  .  .  
-       06 40 09 1e b8 60 00 00 00 
-    // parsed:, offset 106, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 112, len 5, h: 000d: float{0x4048f5c3 / 3.14}
-    // .  @  H  .  .  
-       04 40 48 f5 c3 
-    // parsed:, offset 117, len 39, h: 000e: utf8{"dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5"}
-    // .  .  $  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  d  c  _  w  /  j  m  /  T  _  l  d  c  _  w  _  5  
-       01 00 24 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 64 63 5f 77 2f 6a 6d 2f 54 5f 6c 64 63 5f 77 5f 35 
-    // parsed:, offset 156, len 3, h: 000f: type{dxc.junit.opcodes.ldc_w.jm.T_ldc_w_5}
-    // .  .  .  
-       07 00 0e 
-    // parsed:, offset 159, len 3, h: 0010: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 162, len 0, h: end constant_pool
-// parsed:, offset 162, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 164, len 2, h: this_class: type{dxc.junit.opcodes.ldc_w.jm.T_ldc_w_5}
-// .  .  
-   00 0f 
-// parsed:, offset 166, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 10 
-// parsed:, offset 168, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 172, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 174, len:75,desc: ()V
-// parsed:, offset 174, len 0, h:  methods[0]: 
-    // parsed:, offset 174, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 176, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 178, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 180, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 182, len 0, h:  attributes[0]: 
-        // parsed:, offset 182, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 184, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 188, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 192, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 201, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 205, len 0, h: end attributes[0] 
-// parsed:, offset 205, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 205, len:44,desc: ()F
-// parsed:, offset 205, len 0, h:  methods[1]: 
-    // parsed:, offset 205, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 207, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 209, len 2, h: descriptor: ()F
-    // .  .  
-       00 07 
-    // parsed:, offset 211, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 213, len 0, h:  attributes[0]: 
-        // parsed:, offset 213, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 215, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 219, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 223, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 3, h: 0000: ldc2_w #40091eb860000000 // 3.140000104904175
-        // .  .  .  
-           14 00 0a 
-        // parsed:, offset 3, len 1, h: 0003: pop2
-        // X  
-           58 
-        // parsed:, offset 4, len 3, h: 0004: ldc_w #4048f5c3 // 3.14
-        // .  .  .  
-//@mod           13 00 0d 
-           13 00 0a 
-        // parsed:, offset 7, len 1, h: 0007: freturn
-        // .  
-           ae 
-        // parsed:, offset 235, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 237, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 239, len 0, h: end attributes[0] 
-// parsed:, offset 239, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()F
-// parsed:, offset 239, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 241, len 0, h:  attributes[0]: 
-    // parsed:, offset 241, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 243, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 247, len 2, h: source: utf8{"T_ldc_w_5.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 249, len 0, h: end attributes[0] 
-// parsed:, offset 249, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5.j
deleted file mode 100644
index b6be6e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5.j
+++ /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_ldc_w_5.java
-.class public dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()F
-    .limit stack 2
-    ldc2_w 3.14
-    pop2
-    ldc_w 3.14f
-    freturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_5.java
deleted file mode 100644
index da51419..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldc_w/jm/T_ldc_w_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 dxc.junit.opcodes.ldc_w.jm;
-
-public class T_ldc_w_5 {
-
-    public float run(String a){
-        return 3.14f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/Test_ldiv.java b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/Test_ldiv.java
deleted file mode 100644
index 213d28b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/Test_ldiv.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 dxc.junit.opcodes.ldiv;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ldiv.jm.T_ldiv_1;
-
-public class Test_ldiv extends DxTestCase {
-
-    /**
-     * @title Arguments = 100000000000l, 40000000000l
-     */
-    public void testN1() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(2l, t.run(100000000000l, 40000000000l));
-    }
-
-    /**
-     * @title  Rounding
-     */
-    public void testN2() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(8l, t.run(98765432123456l, 12345678912345l));
-    }
-
-    /**
-     * @title  Dividend = 0
-     */
-    public void testN3() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(0l, t.run(0l, 98765432123456l));
-    }
-
-    /**
-     * @title  Dividend is negative
-     */
-    public void testN4() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(-8, t.run(-98765432123456l, 12345678912345l));
-    }
-
-    /**
-     * @title  Divisor is negative
-     */
-    public void testN5() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(-8, t.run(98765432123456l, -12345678912345l));
-    }
-
-    /**
-     * @title  Both Dividend and divisor are negative
-     */
-    public void testN6() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(80l, t.run(-98765432123456l, -1234567891234l));
-    }
-
-    /**
-     * @title Arguments = Long.MIN_VALUE, -1
-     */
-    public void testB1() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, -1));
-    }
-    /**
-     * @title Arguments = Long.MIN_VALUE, 1
-     */
-    public void testB2() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, 1));
-    }
-    /**
-     * @title Arguments = Long.MAX_VALUE, 1
-     */
-    public void testB3() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(9223372036854775807L, t.run(Long.MAX_VALUE, 1));
-    }
-    /**
-     * @title Arguments = Long.MIN_VALUE, Long.MAX_VALUE
-     */
-    public void testB4() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(-1, t.run(Long.MIN_VALUE, Long.MAX_VALUE));
-    }
-    /**
-     * @title Arguments = 1, Long.MAX_VALUE
-     */
-    public void testB5() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(0, t.run(1, Long.MAX_VALUE));
-    }
-    /**
-     * @title Arguments = 1, Long.MIN_VALUE
-     */
-    public void testB6() {
-        T_ldiv_1 t = new T_ldiv_1();
-        assertEquals(0, t.run(1, Long.MIN_VALUE));
-    }
-
-    /**
-     * @title  Divisor is 0
-     */
-    public void testE1() {
-        T_ldiv_1 t = new T_ldiv_1();
-        try {
-            t.run(12345678912345l, 0);
-            fail("expected ArithmeticException");
-        } catch (ArithmeticException ae) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldiv.jm.T_ldiv_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldiv.jm.T_ldiv_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldiv.jm.T_ldiv_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int / long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldiv.jm.T_ldiv_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float / long
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldiv.jm.T_ldiv_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference / long
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.ldiv.jm.T_ldiv_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_1.j
deleted file mode 100644
index 49f0bda..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_1.j
+++ /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_ldiv_1.java
-.class public dxc/junit/opcodes/ldiv/jm/T_ldiv_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    lload_3
-    ldiv
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_1.java
deleted file mode 100644
index b33a03d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_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 dxc.junit.opcodes.ldiv.jm;
-
-
-public class T_ldiv_1 {
-
-    public long run(long a, long b) {
-        return a/b;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_2.j
deleted file mode 100644
index d1a1bec..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_2.j
+++ /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_ldiv_2.java
-.class public dxc/junit/opcodes/ldiv/jm/T_ldiv_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-;    lload_1
-    lload_3
-    ldiv
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_2.java
deleted file mode 100644
index 0f92d94..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_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 dxc.junit.opcodes.ldiv.jm;
-
-public class T_ldiv_2 {
-
-    public long run(long a, long b) {
-        return a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_3.j
deleted file mode 100644
index 04592e2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_3.j
+++ /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_ldiv_3.java
-.class public dxc/junit/opcodes/ldiv/jm/T_ldiv_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-;    lload_3
-    ldiv
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_3.java
deleted file mode 100644
index 1703f8d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_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 dxc.junit.opcodes.ldiv.jm;
-
-public class T_ldiv_3 {
-
-    public long run(long a, long b) {
-        return a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_4.j
deleted file mode 100644
index 1043a5c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_4.j
+++ /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_ldiv_4.java
-.class public dxc/junit/opcodes/ldiv/jm/T_ldiv_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JD)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    dload_3
-;    d2l    
-    ldiv
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_4.java
deleted file mode 100644
index a9f70ba..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_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 dxc.junit.opcodes.ldiv.jm;
-
-public class T_ldiv_4 {
-
-    public long run(long a, double b) {
-        return (long)(a/b);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_5.j
deleted file mode 100644
index 5e0cd21..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_5.j
+++ /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_ldiv_5.java
-.class public dxc/junit/opcodes/ldiv/jm/T_ldiv_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(IJ)J
-    .limit stack 4
-    .limit locals 4
-
-    iload_1
-;    i2l
-    lload_2
-    ldiv
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_5.java
deleted file mode 100644
index d413aa6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_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 dxc.junit.opcodes.ldiv.jm;
-
-public class T_ldiv_5 {
-
-    public long run(int a, long b) {
-        return a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_6.j b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_6.j
deleted file mode 100644
index 2bf8741..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_6.j
+++ /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_ldiv_6.java
-.class public dxc/junit/opcodes/ldiv/jm/T_ldiv_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FJ)J
-    .limit stack 3
-    .limit locals 4
-    
-    fload_1
-    lload_2
-    ldiv
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_6.java b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_6.java
deleted file mode 100644
index bd48c33..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_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 dxc.junit.opcodes.ldiv.jm;
-
-public class T_ldiv_6 {
-
-    public long run(float a, long b) {
-        return (long)(a/b);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_7.j b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_7.j
deleted file mode 100644
index 9bd04a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_ldiv_7.java
-.class public dxc/junit/opcodes/ldiv/jm/T_ldiv_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    aload_0
-    lload_3
-    ldiv
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_7.java b/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_7.java
deleted file mode 100644
index f859a38..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ldiv/jm/T_ldiv_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 dxc.junit.opcodes.ldiv.jm;
-
-public class T_ldiv_7 {
-    
-    public long run(long a, long b) {
-        return a/b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/Test_lload.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/Test_lload.java
deleted file mode 100644
index ed06cbb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/Test_lload.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 dxc.junit.opcodes.lload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lload.jm.T_lload_1;
-import dxc.junit.opcodes.lload.jm.T_lload_1_w;
-import dxc.junit.opcodes.lload.jm.T_lload_2;
-import dxc.junit.opcodes.lload.jm.T_lload_2_w;
-
-public class Test_lload extends DxTestCase {
-
-    /*
-     * NORMAL ILOAD VERSION
-     */
-
-    /**
-     * @title Test lload 1
-     */
-    public void testN1() {
-        T_lload_1 t = new T_lload_1();
-        assertEquals(1234567890123l, t.run());
-    }
-
-    /**
-     * @title  Test lload 255
-     */
-    public void testN2() {
-        T_lload_2 t = new T_lload_2();
-        assertEquals(9876543210123l, t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.21
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload.jm.T_lload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload.jm.T_lload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload.jm.T_lload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload.jm.T_lload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE ILOAD VERSION
-     */
-
-    /**
-     * @title  Test lload_w 1
-     */
-    public void testN3() {
-        T_lload_1_w t = new T_lload_1_w();
-        assertEquals(1234567890123l, t.run());
-    }
-
-    /**
-     * @title  Test lload 257
-     */
-    public void testN4() {
-        T_lload_2_w t = new T_lload_2_w();
-        assertEquals(9876543210123l, t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload.jm.T_lload_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload.jm.T_lload_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload.jm.T_lload_5_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload.jm.T_lload_6_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1.j
deleted file mode 100644
index 7acd2d7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1.j
+++ /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_lload_1.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 4
-    .limit locals 4
-
-    ldc2_w 1234567890123
-    lstore 1
-    ldc2_w 3
-    lload 1
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1.java
deleted file mode 100644
index 564bc8e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_1 {
-
-    public long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1_w.j
deleted file mode 100644
index db18231..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1_w.j
+++ /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_lload_1_w.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_1_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 4
-    .limit locals 4
-
-    ldc2_w 1234567890123
-    lstore 1
-    ldc2_w 3
-    lload_w 1
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1_w.java
deleted file mode 100644
index e608b1a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_1_w.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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_1_w {
-    
-    public long run() {
-        return 1234567890123l;
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2.j
deleted file mode 100644
index 2034bcd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2.j
+++ /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_lload_2.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 4
-    .limit locals 300
-    
-    ldc2_w 9876543210123
-    lstore 255
-    ldc2_w 3
-    lload 255
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2.java
deleted file mode 100644
index 7149ed5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_2 {
-
-    public long run() {
-        return 9876543210123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2_w.j
deleted file mode 100644
index 6ffe007..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2_w.j
+++ /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_lload_2_w.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_2_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 4
-    .limit locals 300
-    
-    ldc2_w 9876543210123
-    lstore 257
-    ldc2_w 3
-    lload_w 257
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2_w.java
deleted file mode 100644
index 2175495..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_2_w.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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_2_w {
-    
-    public long run() {
-        return 9876543210123l;
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3.j
deleted file mode 100644
index 217bb42..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lload_3.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 2
-
-    lload 2
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3.java
deleted file mode 100644
index ba729a5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3.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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_3 {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3_w.j
deleted file mode 100644
index 7ad273a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lload_3_w.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_3_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 300
-
-    lload_w 300
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3_w.java
deleted file mode 100644
index 2e0a76f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_3_w.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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_3_w {
-    public void run() {
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4.j
deleted file mode 100644
index 2d0c1c3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4.j
+++ /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_lload_4.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 4
-    
-    dconst_1
-    dstore_1
-    
-    lload 1
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4.java
deleted file mode 100644
index 01231c3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_4 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4_w.j
deleted file mode 100644
index 0540f0c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4_w.j
+++ /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_lload_4_w.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_4_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 300
-
-    dconst_1
-    dstore 260
-    
-    lload_w 260
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4_w.java
deleted file mode 100644
index 3a7ebbe..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_4_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lload.jm;
-
-public class T_lload_4_w {
-    
-    public void run() {
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5.j
deleted file mode 100644
index 9e1fc59..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5.j
+++ /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_lload_5.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 4
-    
-    iconst_1
-    istore_1
-    iconst_1
-    istore_2
-    
-    lload 1
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5.java
deleted file mode 100644
index ee11b04..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_5 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5_w.j
deleted file mode 100644
index cc2476b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5_w.j
+++ /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_lload_5_w.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_5_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 300
-
-    iconst_1
-    istore 257
-    iconst_1
-    istore 258
-    
-    lload_w 257
-    
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5_w.java
deleted file mode 100644
index 6d8f81a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_5_w.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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_5_w {
-    public void run() {
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6.j
deleted file mode 100644
index e2a6e09..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6.j
+++ /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_lload_6.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 3
-
-    lconst_1
-    lstore_1
-    
-    lload 1
-    lload 1
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6.java
deleted file mode 100644
index 13bfa4c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_6 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6_w.j
deleted file mode 100644
index af353ad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6_w.j
+++ /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_lload_6_w.java
-.class public dxc/junit/opcodes/lload/jm/T_lload_6_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 300
-
-    lconst_1
-    lstore 257
-    
-    lload_w 257
-    lload_w 257
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6_w.java
deleted file mode 100644
index 9f9a392..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload/jm/T_lload_6_w.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 dxc.junit.opcodes.lload.jm;
-
-public class T_lload_6_w {
-    public void run() {
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/Test_lload_0.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/Test_lload_0.java
deleted file mode 100644
index 907b444..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/Test_lload_0.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lload_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lload_0.jm.T_lload_0_1;
-import dxc.junit.opcodes.lload_0.jm.T_lload_0_6;
-
-public class Test_lload_0 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(1234567890123l, T_lload_0_1.run());
-    }
-
-    /**
-     * @title equality of lload_<n> and lload <n>
-     */
-    public void testN2() {
-        assertTrue(T_lload_0_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_0.jm.T_lload_0_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_0.jm.T_lload_0_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_0.jm.T_lload_0_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_0.jm.T_lload_0_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_1.j
deleted file mode 100644
index 880e0f8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_1.j
+++ /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_lload_0_1.java
-.class public dxc/junit/opcodes/lload_0/jm/T_lload_0_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 2
-    
-    ldc2_w 1234567890123
-    lstore_0
-    ldc2_w 4
-    lload_0
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_1.java
deleted file mode 100644
index f7c26cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_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 dxc.junit.opcodes.lload_0.jm;
-
-public class T_lload_0_1 {
-
-    public static long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_2.j
deleted file mode 100644
index 410c35d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lload_0_2.java
-.class public dxc/junit/opcodes/lload_0/jm/T_lload_0_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    lload_0
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_2.java
deleted file mode 100644
index 965b1c9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_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 dxc.junit.opcodes.lload_0.jm;
-
-public class T_lload_0_2 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_3.j
deleted file mode 100644
index 7fee6f7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_3.j
+++ /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_lload_0_3.java
-.class public dxc/junit/opcodes/lload_0/jm/T_lload_0_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_0
-    
-    lload_0
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_3.java
deleted file mode 100644
index fffd4b7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_3.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 dxc.junit.opcodes.lload_0.jm;
-
-public class T_lload_0_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_4.j
deleted file mode 100644
index d946623..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_4.j
+++ /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_lload_0_4.java
-.class public dxc/junit/opcodes/lload_0/jm/T_lload_0_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    iconst_1
-    istore_0
-    iconst_1
-    istore_1
-    
-    lload_0
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_4.java
deleted file mode 100644
index b054db4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_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 dxc.junit.opcodes.lload_0.jm;
-
-public class T_lload_0_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_5.j
deleted file mode 100644
index 43e0600..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_5.j
+++ /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_lload_0_5.java
-.class public dxc/junit/opcodes/lload_0/jm/T_lload_0_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 2
-
-    lconst_1
-    lstore_0
-    
-    lload_0
-    lload_0
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_5.java
deleted file mode 100644
index 0c71a3e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_5.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 dxc.junit.opcodes.lload_0.jm;
-
-public class T_lload_0_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_6.j
deleted file mode 100644
index e1b7d2f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_6.j
+++ /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_lload_0_6.java
-.class public dxc/junit/opcodes/lload_0/jm/T_lload_0_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 3
-
-    ldc2_w 1234567890123
-    lstore_0
-
-    lload_0
-    lload 0
-
-    lcmp
-    ifne Label0
-    iconst_1
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_6.java
deleted file mode 100644
index 2f225f9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_0/jm/T_lload_0_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 dxc.junit.opcodes.lload_0.jm;
-
-public class T_lload_0_6 {
-
-    public static boolean run() {
-        long i = 1234567890123l;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/Test_lload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/Test_lload_1.java
deleted file mode 100644
index 161d6d9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/Test_lload_1.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lload_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lload_1.jm.T_lload_1_1;
-import dxc.junit.opcodes.lload_1.jm.T_lload_1_6;
-
-public class Test_lload_1 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(1234567890123l, T_lload_1_1.run());
-    }
-
-    /**
-     * @title equality of lload_<n> and lload <n>
-     */
-    public void testN2() {
-        assertTrue(T_lload_1_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_1.jm.T_lload_1_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_1.jm.T_lload_1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_1.jm.T_lload_1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_1.jm.T_lload_1_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_1.j
deleted file mode 100644
index f6f0f2e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_1.j
+++ /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_lload_1_1.java
-.class public dxc/junit/opcodes/lload_1/jm/T_lload_1_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 3
-    
-    ldc2_w 1234567890123
-    lstore_1
-    ldc2_w 4
-    lload_1
-    lreturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_1.java
deleted file mode 100644
index e111f73..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_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 dxc.junit.opcodes.lload_1.jm;
-
-public class T_lload_1_1 {
-
-    public static long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_2.j
deleted file mode 100644
index ea2e467..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lload_1_2.java
-.class public dxc/junit/opcodes/lload_1/jm/T_lload_1_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    lload_1
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_2.java
deleted file mode 100644
index 6734f21..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_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 dxc.junit.opcodes.lload_1.jm;
-
-public class T_lload_1_2 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_3.j
deleted file mode 100644
index 9c50055..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_3.j
+++ /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_lload_1_3.java
-.class public dxc/junit/opcodes/lload_1/jm/T_lload_1_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_1
-    
-    lload_1
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_3.java
deleted file mode 100644
index 3161c8e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_3.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 dxc.junit.opcodes.lload_1.jm;
-
-public class T_lload_1_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_4.j
deleted file mode 100644
index 93ec644..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_4.j
+++ /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_lload_1_4.java
-.class public dxc/junit/opcodes/lload_1/jm/T_lload_1_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    iconst_1
-    istore_1
-    iconst_1
-    istore_2
-    
-    lload_1
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_4.java
deleted file mode 100644
index 7bcdd19..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_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 dxc.junit.opcodes.lload_1.jm;
-
-public class T_lload_1_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_5.j
deleted file mode 100644
index 16e89db..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_5.j
+++ /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_lload_1_5.java
-.class public dxc/junit/opcodes/lload_1/jm/T_lload_1_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 3
-
-    lconst_1
-    lstore_1
-    
-    lload_1
-    lload_1
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_5.java
deleted file mode 100644
index 8e3b949..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_5.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 dxc.junit.opcodes.lload_1.jm;
-
-public class T_lload_1_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_6.j
deleted file mode 100644
index 2cdbd8a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_6.j
+++ /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_lload_1_6.java
-.class public dxc/junit/opcodes/lload_1/jm/T_lload_1_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 3
-
-    ldc2_w 1234567890123
-    lstore_1
-
-    lload_1
-    lload 1
-    lcmp
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_6.java
deleted file mode 100644
index 91fc928..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_1/jm/T_lload_1_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 dxc.junit.opcodes.lload_1.jm;
-
-public class T_lload_1_6 {
-
-    public static boolean run() {
-        long i = 1234567890123l;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/Test_lload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/Test_lload_2.java
deleted file mode 100644
index e8976b8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/Test_lload_2.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lload_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lload_2.jm.T_lload_2_1;
-import dxc.junit.opcodes.lload_2.jm.T_lload_2_6;
-
-public class Test_lload_2 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(1234567890123l, T_lload_2_1.run());
-    }
-
-    /**
-     * @title equality of lload_<n> and lload <n>
-     */
-    public void testN2() {
-        assertTrue(T_lload_2_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_2.jm.T_lload_2_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_2.jm.T_lload_2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_2.jm.T_lload_2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_2.jm.T_lload_2_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_1.j
deleted file mode 100644
index 753ab6a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_1.j
+++ /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_lload_2_1.java
-.class public dxc/junit/opcodes/lload_2/jm/T_lload_2_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 4
-    
-    ldc2_w 1234567890123
-    lstore_2
-    ldc2_w 4
-    lload_2
-    lreturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_1.java
deleted file mode 100644
index 86720db..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_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 dxc.junit.opcodes.lload_2.jm;
-
-public class T_lload_2_1 {
-
-    public static long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_2.j
deleted file mode 100644
index 4ce9a63..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lload_2_2.java
-.class public dxc/junit/opcodes/lload_2/jm/T_lload_2_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    lload_2
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_2.java
deleted file mode 100644
index cd54b1b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_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 dxc.junit.opcodes.lload_2.jm;
-
-public class T_lload_2_2 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_3.j
deleted file mode 100644
index 85c8f7d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_3.j
+++ /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_lload_2_3.java
-.class public dxc/junit/opcodes/lload_2/jm/T_lload_2_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    dstore_2
-    
-    lload_2
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_3.java
deleted file mode 100644
index 866e9a1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_3.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 dxc.junit.opcodes.lload_2.jm;
-
-public class T_lload_2_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_4.j
deleted file mode 100644
index ee23e5c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_4.j
+++ /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_lload_2_4.java
-.class public dxc/junit/opcodes/lload_2/jm/T_lload_2_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    iconst_2
-    istore_2
-    iconst_2
-    istore_3
-    
-    lload_2
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_4.java
deleted file mode 100644
index c6305a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_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 dxc.junit.opcodes.lload_2.jm;
-
-public class T_lload_2_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_5.j
deleted file mode 100644
index 8e0022d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_5.j
+++ /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_lload_2_5.java
-.class public dxc/junit/opcodes/lload_2/jm/T_lload_2_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 3
-
-    lconst_1
-    lstore_2
-    
-    lload_2
-    lload_2
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_5.java
deleted file mode 100644
index d21571e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_5.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 dxc.junit.opcodes.lload_2.jm;
-
-public class T_lload_2_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_6.j
deleted file mode 100644
index 10633f0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_6.j
+++ /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_lload_2_6.java
-.class public dxc/junit/opcodes/lload_2/jm/T_lload_2_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 4
-
-    ldc2_w 1234567890123
-    lstore_2
-
-    lload_2
-    lload 2
-    lcmp
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_6.java
deleted file mode 100644
index 41fa7ac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_2/jm/T_lload_2_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 dxc.junit.opcodes.lload_2.jm;
-
-public class T_lload_2_6 {
-
-    public static boolean run() {
-        long i = 1234567890123l;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/Test_lload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/Test_lload_3.java
deleted file mode 100644
index 16227ea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/Test_lload_3.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lload_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lload_3.jm.T_lload_3_1;
-import dxc.junit.opcodes.lload_3.jm.T_lload_3_6;
-
-public class Test_lload_3 extends DxTestCase {
-
-    /**
-     * @title value is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(1234567890123l, T_lload_3_1.run());
-    }
-
-    /**
-     * @title equality of lload_<n> and lload <n>
-     */
-    public void testN2() {
-        assertTrue(T_lload_3_6.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_3.jm.T_lload_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_3.jm.T_lload_3_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_3.jm.T_lload_3_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lload_3.jm.T_lload_3_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_1.j
deleted file mode 100644
index 987c791..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_1.j
+++ /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_lload_3_1.java
-.class public dxc/junit/opcodes/lload_3/jm/T_lload_3_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 5
-    
-    ldc2_w 1234567890123
-    lstore_3
-    ldc2_w 4
-    lload_3
-    lreturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_1.java
deleted file mode 100644
index e5436cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_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 dxc.junit.opcodes.lload_3.jm;
-
-public class T_lload_3_1 {
-
-    public static long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_2.j
deleted file mode 100644
index 1e4a2a2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lload_3_2.java
-.class public dxc/junit/opcodes/lload_3/jm/T_lload_3_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    lload_3
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_2.java
deleted file mode 100644
index 2e12383..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_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 dxc.junit.opcodes.lload_3.jm;
-
-public class T_lload_3_2 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_3.j
deleted file mode 100644
index 0d06391..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_3.j
+++ /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_lload_3_3.java
-.class public dxc/junit/opcodes/lload_3/jm/T_lload_3_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    dconst_1
-    dstore_3
-    
-    lload_3
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_3.java
deleted file mode 100644
index add5f68..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_3.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 dxc.junit.opcodes.lload_3.jm;
-
-public class T_lload_3_3 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_4.j
deleted file mode 100644
index 6fe0e5c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_4.j
+++ /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_lload_3_4.java
-.class public dxc/junit/opcodes/lload_3/jm/T_lload_3_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    iconst_1
-    istore_3
-    iconst_1
-    istore 4
-    
-    lload_3
-    
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_4.java
deleted file mode 100644
index 26fb64c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_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 dxc.junit.opcodes.lload_3.jm;
-
-public class T_lload_3_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_5.j
deleted file mode 100644
index 6639760..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_5.j
+++ /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_lload_3_5.java
-.class public dxc/junit/opcodes/lload_3/jm/T_lload_3_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 1
-    .limit locals 5
-
-    lconst_1
-    lstore_3
-    
-    lload_3
-    lload_3
-    
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_5.java
deleted file mode 100644
index 552d7e6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_5.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 dxc.junit.opcodes.lload_3.jm;
-
-public class T_lload_3_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_6.j
deleted file mode 100644
index ddfb923..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_6.j
+++ /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_lload_3_6.java
-.class public dxc/junit/opcodes/lload_3/jm/T_lload_3_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 5
-
-    ldc2_w 1234567890123
-    lstore_3
-
-    lload_3
-    lload 3
-    lcmp
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-    ireturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_6.java
deleted file mode 100644
index 781ed48..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lload_3/jm/T_lload_3_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 dxc.junit.opcodes.lload_3.jm;
-
-public class T_lload_3_6 {
-
-    public static boolean run() {
-        long i = 1234567890123l;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/Test_lmul.java b/tools/dx-tests/src/dxc/junit/opcodes/lmul/Test_lmul.java
deleted file mode 100644
index 8bd913a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/Test_lmul.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lmul;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lmul.jm.T_lmul_1;
-
-public class Test_lmul extends DxTestCase {
-
-    /**
-     * @title Arguments = 222000000000l, 5000000000l
-     */
-    public void testN1() {
-        T_lmul_1 t = new T_lmul_1();
-        assertEquals(3195355577426903040l, t.run(222000000000l, 5000000000l));
-    }
-
-    /**
-     * @title Arguments = -123456789l, 123456789l
-     */
-    public void testN2() {
-        T_lmul_1 t = new T_lmul_1();
-        assertEquals(-15241578750190521l, t.run(-123456789l, 123456789l));
-    }
-
-    /**
-     * @title Arguments = -123456789l, -123456789l
-     */
-    public void testN3() {
-        T_lmul_1 t = new T_lmul_1();
-        assertEquals(15241578750190521l, t.run(-123456789l, -123456789l));
-    }
-
-    /**
-     * @title Arguments = 0, Long.MAX_VALUE
-     */
-    public void testB1() {
-        T_lmul_1 t = new T_lmul_1();
-        assertEquals(0, t.run(0, Long.MAX_VALUE));
-    }
-    /**
-     * @title Arguments = Long.MAX_VALUE, 1
-     */
-    public void testB2() {
-        T_lmul_1 t = new T_lmul_1();
-        assertEquals(9223372036854775807L, t.run(Long.MAX_VALUE, 1));
-    }
-    /**
-     * @title Arguments = Long.MIN_VALUE, 1
-     */
-    public void testB3() {
-        T_lmul_1 t = new T_lmul_1();
-        assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, 1));
-    }
-    /**
-     * @title Arguments = Long.MAX_VALUE, Long.MIN_VALUE
-     */
-    public void testB4() {
-        T_lmul_1 t = new T_lmul_1();
-        assertEquals(-9223372036854775808L, t.run(Long.MAX_VALUE,
-                Long.MIN_VALUE));
-    }
-    /**
-     * @title Arguments = 0, 0
-     */
-    public void testB5() {
-        T_lmul_1 t = new T_lmul_1();
-        assertEquals(0, t.run(0, 0));
-    }
-    /**
-     * @title Arguments = Long.MAX_VALUE, -1
-     */
-    public void testB6() {
-        T_lmul_1 t = new T_lmul_1();
-        assertEquals(-9223372036854775807L, t.run(Long.MAX_VALUE, -1));
-    }
-    /**
-     * @title Arguments = Long.MIN_VALUE, -1
-     */
-    public void testB7() {
-        T_lmul_1 t = new T_lmul_1();
-        assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE, -1));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lmul.jm.T_lmul_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lmul.jm.T_lmul_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long * double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lmul.jm.T_lmul_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long * int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lmul.jm.T_lmul_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float * long
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lmul.jm.T_lmul_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference * long
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.lmul.jm.T_lmul_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_1.j
deleted file mode 100644
index 59ba73e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_1.j
+++ /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_lmul_1.java
-.class public dxc/junit/opcodes/lmul/jm/T_lmul_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    lload_3
-    lmul
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_1.java
deleted file mode 100644
index 455a293..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_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 dxc.junit.opcodes.lmul.jm;
-
-public class T_lmul_1 {
-
-    public long run(long a, long b) {
-        return a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_2.j
deleted file mode 100644
index 2965969..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_2.j
+++ /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_lmul_2.java
-.class public dxc/junit/opcodes/lmul/jm/T_lmul_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-;    lload_1
-    lload_3
-    lmul
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_2.java
deleted file mode 100644
index 10a1dce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_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 dxc.junit.opcodes.lmul.jm;
-
-public class T_lmul_2 {
-
-    public long run(long a, long b) {
-        return a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_3.j
deleted file mode 100644
index 32818bf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_3.j
+++ /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_lmul_3.java
-.class public dxc/junit/opcodes/lmul/jm/T_lmul_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-;    lload_3
-    lmul
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_3.java
deleted file mode 100644
index 44d7e83..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_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 dxc.junit.opcodes.lmul.jm;
-
-public class T_lmul_3 {
-
-    public long run(long a, long b) {
-        return a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_4.j
deleted file mode 100644
index b50059e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_4.j
+++ /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_lmul_4.java
-.class public dxc/junit/opcodes/lmul/jm/T_lmul_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JD)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    dload_3
-    lmul
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_4.java
deleted file mode 100644
index db452a1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_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 dxc.junit.opcodes.lmul.jm;
-
-public class T_lmul_4 {
-
-    public long run(long a, double b) {
-        return (long)(a*b);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_5.j
deleted file mode 100644
index 7fe2ef8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_5.j
+++ /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_lmul_5.java
-.class public dxc/junit/opcodes/lmul/jm/T_lmul_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JI)J
-    .limit stack 4
-    .limit locals 4
-
-    lload_1
-    iload_3
-    lmul
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_5.java
deleted file mode 100644
index 8869241..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_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 dxc.junit.opcodes.lmul.jm;
-
-public class T_lmul_5 {
-
-    public long run(long a, int b) {
-        return a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_6.j
deleted file mode 100644
index 691a9a1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_6.j
+++ /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_lmul_6.java
-.class public dxc/junit/opcodes/lmul/jm/T_lmul_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FJ)J
-    .limit stack 3
-    .limit locals 4
-
-    fload_1
-    lload_2
-    lmul
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_6.java
deleted file mode 100644
index 46ecbec..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_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 dxc.junit.opcodes.lmul.jm;
-
-public class T_lmul_6 {
-
-    public long run(float a, long b) {
-        return (long)(a*b);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_7.j b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_7.j
deleted file mode 100644
index fe37744..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lmul_7.java
-.class public dxc/junit/opcodes/lmul/jm/T_lmul_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    aload_0
-    lload_3
-    lmul
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_7.java b/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_7.java
deleted file mode 100644
index b30347d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lmul/jm/T_lmul_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 dxc.junit.opcodes.lmul.jm;
-
-public class T_lmul_7 {
-    
-    public long run(long a, long b) {
-        return a*b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/Test_lneg.java b/tools/dx-tests/src/dxc/junit/opcodes/lneg/Test_lneg.java
deleted file mode 100644
index b9d2010..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/Test_lneg.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 dxc.junit.opcodes.lneg;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lneg.jm.T_lneg_1;
-import dxc.junit.opcodes.lneg.jm.T_lneg_2;
-
-public class Test_lneg extends DxTestCase {
-
-    /**
-     * @title Argument = 123123123272432432l
-     */
-    public void testN1() {
-        T_lneg_1 t = new T_lneg_1();
-        assertEquals(-123123123272432432l, t.run(123123123272432432l));
-    }
-
-    /**
-     * @title  Argument = 1
-     */
-    public void testN2() {
-        T_lneg_1 t = new T_lneg_1();
-        assertEquals(-1l, t.run(1l));
-    }
-
-    /**
-     * @title  Argument = -1
-     */
-    public void testN3() {
-        T_lneg_1 t = new T_lneg_1();
-        assertEquals(1l, t.run(-1l));
-    }
-
-    /**
-     * @title  Check that -x == (~x + 1)
-     */
-    public void testN4() {
-        T_lneg_2 t = new T_lneg_2();
-        assertTrue(t.run(123123123272432432l));
-    }
-
-    /**
-     * @title  Argument = 0
-     */
-    public void testB1() {
-        T_lneg_1 t = new T_lneg_1();
-        assertEquals(0, t.run(0));
-    }
-
-    /**
-     * @title  Argument = Long.MAX_VALUE
-     */
-    public void testB2() {
-        T_lneg_1 t = new T_lneg_1();
-        assertEquals(-9223372036854775807L, t.run(Long.MAX_VALUE));
-    }
-
-    /**
-     * @title  Argument = Long.MIN_VALUE
-     */
-    public void testB3() {
-        T_lneg_1 t = new T_lneg_1();
-        assertEquals(-9223372036854775808L, t.run(Long.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lneg.jm.T_lneg_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lneg.jm.T_lneg_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lneg.jm.T_lneg_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lneg.jm.T_lneg_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lneg.jm.T_lneg_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_1.j
deleted file mode 100644
index a92e968..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_1.j
+++ /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_lneg_1.java
-.class public dxc/junit/opcodes/lneg/jm/T_lneg_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(J)J
-    .limit stack 2
-    .limit locals 3
-
-    lload_1
-    lneg
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_1.java
deleted file mode 100644
index 662717f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_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 dxc.junit.opcodes.lneg.jm;
-
-public class T_lneg_1 {
-
-    public long run(long d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_2.j
deleted file mode 100644
index 3142cdb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_2.j
+++ /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_lneg_2.java
-.class public dxc/junit/opcodes/lneg/jm/T_lneg_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(J)Z
-    .limit stack 6
-    .limit locals 3
-
-    lload_1
-    lneg
-    lload_1
-    ldc2_w -1
-    lxor
-    lconst_1
-    ladd
-    lcmp
-    ifne Label0
-    iconst_1
-    ireturn
-
-    Label0:
-    iconst_0
-
-    Label2:
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_2.java
deleted file mode 100644
index 44b3657..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_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 dxc.junit.opcodes.lneg.jm;
-
-public class T_lneg_2 {
-
-    public boolean run(long d) {
-        return -d == (~d + 1);
-     }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_3.j
deleted file mode 100644
index 1fe25a9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_3.j
+++ /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_lneg_3.java
-.class public dxc/junit/opcodes/lneg/jm/T_lneg_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(J)J
-    .limit stack 2
-    .limit locals 3
-
-;    lload_1
-    lneg
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_3.java
deleted file mode 100644
index 423f347..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_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 dxc.junit.opcodes.lneg.jm;
-
-public class T_lneg_3 {
-
-    public long run(long d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_4.j
deleted file mode 100644
index 5e585ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_4.j
+++ /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_lneg_4.java
-.class public dxc/junit/opcodes/lneg/jm/T_lneg_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(D)J
-    .limit stack 2
-    .limit locals 3
-
-    dload_1
-    lneg
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_4.java
deleted file mode 100644
index e2bbda3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_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 dxc.junit.opcodes.lneg.jm;
-
-public class T_lneg_4 {
-
-    public long run(double d) {
-        return (long)-d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_5.j
deleted file mode 100644
index bc1a58f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_5.j
+++ /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_lneg_5.java
-.class public dxc/junit/opcodes/lneg/jm/T_lneg_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(I)J
-    .limit stack 2
-    .limit locals 2
-
-    iload_1
-    lneg
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_5.java
deleted file mode 100644
index 8d80a66..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_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 dxc.junit.opcodes.lneg.jm;
-
-public class T_lneg_5 {
-
-    public long run(int d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_6.j
deleted file mode 100644
index 2b5fa6d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_6.j
+++ /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_lneg_6.java
-.class public dxc/junit/opcodes/lneg/jm/T_lneg_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(F)J
-    .limit stack 2
-    .limit locals 2
-
-    fload_1
-    lneg
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_6.java
deleted file mode 100644
index 47b901a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_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 dxc.junit.opcodes.lneg.jm;
-
-public class T_lneg_6 {
-
-    public long run(float d) {
-        return (long)-d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_7.j b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_7.j
deleted file mode 100644
index a5e1696..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_7.j
+++ /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_lneg_7.java
-.class public dxc/junit/opcodes/lneg/jm/T_lneg_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(J)J
-    .limit stack 2
-    .limit locals 3
-
-    aload_0
-    lneg
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_7.java b/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_7.java
deleted file mode 100644
index ccbc868..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lneg/jm/T_lneg_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 dxc.junit.opcodes.lneg.jm;
-
-public class T_lneg_7 {
-    
-    public long run(long d) {
-        return -d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/Test_lookupswitch.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/Test_lookupswitch.java
deleted file mode 100644
index 5b5ced8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/Test_lookupswitch.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 dxc.junit.opcodes.lookupswitch;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_1;
-
-public class Test_lookupswitch extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_lookupswitch_1 t = new T_lookupswitch_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 check Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_lookupswitch_1 t = new T_lookupswitch_1();
-        assertEquals(-1, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title check Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_lookupswitch_1 t = new T_lookupswitch_1();
-        assertEquals(-1, t.run(Integer.MIN_VALUE));
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.9
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.9
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.9
-     * @title npairs shall be >= 0
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.9
-     * @title non-zero padding
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.9
-     * @title pairs shall be sorted in ascending
-     * order
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.9
-     * @title number of entries in jump table
-     */
-    public void testVFE9() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_1.j
deleted file mode 100644
index 310c3d1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_1.j
+++ /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_lookupswitch_1.java
-.class public dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    lookupswitch
-            -1 : Label0
-            10 : Label1
-            15 : Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_1.java
deleted file mode 100644
index 0f1f657..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_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 dxc.junit.opcodes.lookupswitch.jm;
-
-public class T_lookupswitch_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/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10.cfh b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10.cfh
deleted file mode 100644
index d4c30e8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 25, h: 0006: utf8{"T_lookupswitch_10.java"}
-    // .  .  .  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  1  0  .  j  a  v  a  
-       01 00 16 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 31 30 2e 6a 61 76 61 
-    // parsed:, offset 87, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0b 
-    // parsed:, offset 92, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 99, len 54, h: 0009: utf8{"dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10"}
-    // .  .  3  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  o  o  k  u  p  s  w  i  t  c  h  /  j  m  /  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  1  0  
-       01 00 33 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 31 30 
-    // parsed:, offset 153, len 3, h: 000a: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_10}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 156, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 162, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 165, len 0, h: end constant_pool
-// parsed:, offset 165, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 167, len 2, h: this_class: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_10}
-// .  .  
-   00 0a 
-// parsed:, offset 169, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 171, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 173, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 175, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 177, len:89,desc: ()V
-// parsed:, offset 177, len 0, h:  methods[0]: 
-    // parsed:, offset 177, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 179, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 181, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 183, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 185, len 0, h:  attributes[0]: 
-        // parsed:, offset 185, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 187, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 191, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 193, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 195, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 204, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 206, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 208, len 0, h: end attributes[0] 
-// parsed:, offset 208, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 208, len:58,desc: ()V
-// parsed:, offset 208, len 0, h:  methods[1]: 
-    // parsed:, offset 208, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 210, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 212, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 214, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 216, len 0, h:  attributes[0]: 
-        // parsed:, offset 216, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 218, len 4, h: length: 00000022
-        // .  .  .  "  
-           00 00 00 22 
-        // parsed:, offset 222, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 224, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 4, h: code_length: 00000016
-        // .  .  .  .  
-           00 00 00 16 
-        // parsed:, offset 0, len 1, h: 0000: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 1, len 19, h: 0001: lookupswitch   -00000001: 0014   default: 0015
-        // .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  
-//@mod           ab 00 00 00 00 00 14 00 00 00 01 ff ff ff ff 00 00 00 13 
-           ab 00 00 00 00 00 14 00 00 00 02 ff ff ff ff 00 00 00 13 
-        // parsed:, offset 20, len 1, h: 0014: return
-        // .  
-           b1 
-        // parsed:, offset 21, len 1, h: 0015: return
-        // .  
-           b1 
-        // parsed:, offset 252, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 254, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 256, len 0, h: end attributes[0] 
-// parsed:, offset 256, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 256, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 258, len 0, h:  attributes[0]: 
-    // parsed:, offset 258, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 260, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 264, len 2, h: source: utf8{"T_lookupswitch_10.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 266, len 0, h: end attributes[0] 
-// parsed:, offset 266, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10.j b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10.j
deleted file mode 100644
index 73ad264..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10.j
+++ /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_lookupswitch_10.java
-.class public dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-    iconst_1
-    lookupswitch
-            -1 : Label0
-            default: Label2
-
- Label0:
-    return
-
-Label2:
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10.java
deleted file mode 100644
index ee806f4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_10.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 dxc.junit.opcodes.lookupswitch.jm;
-
-public class T_lookupswitch_10 {
-
-    public void run() {
-        switch (1) {
-        case -1:
-            return;
-        case 10:
-            return;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_2.j
deleted file mode 100644
index db16d9d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_2.j
+++ /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_lookupswitch_2.java
-.class public dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-;    iload_1
-    lookupswitch
-            -1 : Label0
-            10 : Label1
-            15 : Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_2.java
deleted file mode 100644
index 05ec5ce..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_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 dxc.junit.opcodes.lookupswitch.jm;
-
-public class T_lookupswitch_2 {
-
-    public int run(int i) {
-        switch (i) {
-        case -1:
-            return 2;
-        case 10:
-        case 15:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_3.j
deleted file mode 100644
index 0b96e9d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_3.j
+++ /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_lookupswitch_3.java
-.class public dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    fconst_1
-    lookupswitch
-            -1 : Label0
-            10 : Label1
-            15 : Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_3.java
deleted file mode 100644
index 1c777ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_3.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 dxc.junit.opcodes.lookupswitch.jm;
-
-public class T_lookupswitch_3 {
-
-    public int run(int i) {
-        switch (i) {
-        case -1:
-            return 2;
-        case 10:
-        case 15:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4.cfh
deleted file mode 100644
index 436d184..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 06 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0a 
-    // parsed:, offset 67, len 3, h: 0007: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_4}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 70, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 77, len 53, h: 0009: utf8{"dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4"}
-    // .  .  2  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  o  o  k  u  p  s  w  i  t  c  h  /  j  m  /  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  4  
-       01 00 32 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 34 
-    // parsed:, offset 130, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 136, len 24, h: 000b: utf8{"T_lookupswitch_4.java"}
-    // .  .  .  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  4  .  j  a  v  a  
-       01 00 15 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 34 2e 6a 61 76 61 
-    // parsed:, offset 160, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 163, len 7, h: 000d: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-// parsed:, offset 170, len 0, h: end constant_pool
-// parsed:, offset 170, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 172, len 2, h: this_class: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_4}
-// .  .  
-   00 07 
-// parsed:, offset 174, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 176, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 178, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 180, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 182, len:110,desc: ()V
-// parsed:, offset 182, len 0, h:  methods[0]: 
-    // parsed:, offset 182, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 184, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 186, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 188, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 190, len 0, h:  attributes[0]: 
-        // parsed:, offset 190, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 192, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 196, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 198, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 200, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 209, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 211, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 213, len 0, h: end attributes[0] 
-// parsed:, offset 213, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 213, len:79,desc: (I)I
-// parsed:, offset 213, len 0, h:  methods[1]: 
-    // parsed:, offset 213, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 215, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 217, len 2, h: descriptor: (I)I
-    // .  .  
-       00 0d 
-    // parsed:, offset 219, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 221, len 0, h:  attributes[0]: 
-        // parsed:, offset 221, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 223, len 4, h: length: 00000037
-        // .  .  .  7  
-           00 00 00 37 
-        // parsed:, offset 227, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 229, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 231, len 4, h: code_length: 0000002b
-        // .  .  .  +  
-           00 00 00 2b 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 35, h: 0001: lookupswitch   -00000001: 0024   +0000000a: 0026   +0000000f: 0026   default: 0029
-        // .  .  .  .  .  .  (  .  .  .  .  .  .  .  .  .  .  .  #  .  .  .  .  .  .  .  %  .  .  .  .  .  .  .  %  
-//@mod           ab 00 00 00 00 00 28 00 00 00 03 ff ff ff ff 00 00 00 23 00 00 00 0a 00 00 00 25 00 00 00 0f 00 00 00 25 
-           ab 00 00 00 00 00 28 00 00 00 03 ff ff ff ff 00 00 00 23 00 00 00 0a 00 00 00 25 00 00 00 0f 00 00 00 ff 
-        // parsed:, offset 36, len 1, h: 0024: iconst_2 // #+02
-        // .  
-           05 
-        // parsed:, offset 37, len 1, h: 0025: ireturn
-        // .  
-           ac 
-        // parsed:, offset 38, len 2, h: 0026: bipush #+14
-        // .  .  
-           10 14 
-        // parsed:, offset 40, len 1, h: 0028: ireturn
-        // .  
-           ac 
-        // parsed:, offset 41, len 1, h: 0029: iconst_m1 // #-01
-        // .  
-           02 
-        // parsed:, offset 42, len 1, h: 002a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 278, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 280, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 282, len 0, h: end attributes[0] 
-// parsed:, offset 282, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)I
-// parsed:, offset 282, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 284, len 0, h:  attributes[0]: 
-    // parsed:, offset 284, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 286, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 290, len 2, h: source: utf8{"T_lookupswitch_4.java"}
-    // .  .  
-       00 0b 
-// parsed:, offset 292, len 0, h: end attributes[0] 
-// parsed:, offset 292, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4.j
deleted file mode 100644
index e342dc3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4.j
+++ /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_lookupswitch_4.java
-.class public dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-
-    lookupswitch
-            -1 : Label0
-            10 : Label1
-            15 : Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4.java
deleted file mode 100644
index 407ccad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_4.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 dxc.junit.opcodes.lookupswitch.jm;
-
-public class T_lookupswitch_4 {
-
-    public int run(int i) {
-        switch (i) {
-        case -1:
-            return 2;
-        case 10:
-        case 15:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5.cfh
deleted file mode 100644
index e578a07..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 24, h: 0001: utf8{"T_lookupswitch_5.java"}
-    // .  .  .  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  5  .  j  a  v  a  
-       01 00 15 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 34, len 5, h: 0002: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 07 
-    // parsed:, offset 39, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 58, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 71, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 80, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 86, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0a 
-    // parsed:, offset 91, len 3, h: 0008: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_5}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 94, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 101, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 107, len 53, h: 000b: utf8{"dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5"}
-    // .  .  2  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  o  o  k  u  p  s  w  i  t  c  h  /  j  m  /  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  5  
-       01 00 32 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 35 
-    // parsed:, offset 160, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 163, len 7, h: 000d: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-// parsed:, offset 170, len 0, h: end constant_pool
-// parsed:, offset 170, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 172, len 2, h: this_class: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_5}
-// .  .  
-   00 08 
-// parsed:, offset 174, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 176, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 178, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 180, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 182, len:112,desc: ()V
-// parsed:, offset 182, len 0, h:  methods[0]: 
-    // parsed:, offset 182, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 184, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 186, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 188, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 190, len 0, h:  attributes[0]: 
-        // parsed:, offset 190, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 192, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 196, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 198, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 200, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 02 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 209, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 211, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 213, len 0, h: end attributes[0] 
-// parsed:, offset 213, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 213, len:81,desc: (I)I
-// parsed:, offset 213, len 0, h:  methods[1]: 
-    // parsed:, offset 213, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 215, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 217, len 2, h: descriptor: (I)I
-    // .  .  
-       00 0d 
-    // parsed:, offset 219, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 221, len 0, h:  attributes[0]: 
-        // parsed:, offset 221, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 223, len 4, h: length: 00000039
-        // .  .  .  9  
-           00 00 00 39 
-        // parsed:, offset 227, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 229, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 231, len 4, h: code_length: 0000002d
-        // .  .  .  -  
-           00 00 00 2d 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 35, h: 0001: lookupswitch   -00000001: 0024   +0000000a: 0026   +0000000f: 0026   default: 002b
-        // .  .  .  .  .  .  *  .  .  .  .  .  .  .  .  .  .  .  #  .  .  .  .  .  .  .  %  .  .  .  .  .  .  .  %  
-//@mod           ab 00 00 00 00 00 2a 00 00 00 03 ff ff ff ff 00 00 00 23 00 00 00 0a 00 00 00 25 00 00 00 0f 00 00 00 25 
-           ab 00 00 00 00 00 2a 00 00 00 03 ff ff ff ff 00 00 00 23 00 00 00 0a 00 00 00 26 00 00 00 0f 00 00 00 25 
-        // parsed:, offset 36, len 1, h: 0024: iconst_2 // #+02
-        // .  
-           05 
-        // parsed:, offset 37, len 1, h: 0025: ireturn
-        // .  
-           ac 
-        // parsed:, offset 38, len 4, h: 0026: wide iload 0001
-        // .  .  .  .  
-           c4 15 00 01 
-        // parsed:, offset 42, len 1, h: 002a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 43, len 1, h: 002b: iconst_m1 // #-01
-        // .  
-           02 
-        // parsed:, offset 44, len 1, h: 002c: ireturn
-        // .  
-           ac 
-        // parsed:, offset 280, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 282, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 284, len 0, h: end attributes[0] 
-// parsed:, offset 284, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)I
-// parsed:, offset 284, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 286, len 0, h:  attributes[0]: 
-    // parsed:, offset 286, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 288, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 292, len 2, h: source: utf8{"T_lookupswitch_5.java"}
-    // .  .  
-       00 01 
-// parsed:, offset 294, len 0, h: end attributes[0] 
-// parsed:, offset 294, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5.j
deleted file mode 100644
index cd74f87..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5.j
+++ /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_lookupswitch_5.java
-.class public dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-
-    lookupswitch
-            -1 : Label0
-            10 : Label1
-            15 : Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    iload_w 1
-;
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5.java
deleted file mode 100644
index 9fbeaa4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_5.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 dxc.junit.opcodes.lookupswitch.jm;
-
-public class T_lookupswitch_5 {
-
-    public int run(int i) {
-        switch (i) {
-        case -1:
-            return 2;
-        case 10:
-        case 15:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6.cfh
deleted file mode 100644
index 6ea0620..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 24, h: 0006: utf8{"T_lookupswitch_6.java"}
-    // .  .  .  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  6  .  j  a  v  a  
-       01 00 15 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 86, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0a 
-    // parsed:, offset 91, len 3, h: 0008: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_6}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 94, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 101, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 107, len 53, h: 000b: utf8{"dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6"}
-    // .  .  2  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  o  o  k  u  p  s  w  i  t  c  h  /  j  m  /  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  6  
-       01 00 32 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 36 
-    // parsed:, offset 160, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 163, len 7, h: 000d: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-// parsed:, offset 170, len 0, h: end constant_pool
-// parsed:, offset 170, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 172, len 2, h: this_class: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_6}
-// .  .  
-   00 08 
-// parsed:, offset 174, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 176, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 178, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 180, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 182, len:110,desc: ()V
-// parsed:, offset 182, len 0, h:  methods[0]: 
-    // parsed:, offset 182, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 184, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 186, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 188, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 190, len 0, h:  attributes[0]: 
-        // parsed:, offset 190, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 192, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 196, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 198, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 200, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 209, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 211, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 213, len 0, h: end attributes[0] 
-// parsed:, offset 213, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 213, len:79,desc: (I)I
-// parsed:, offset 213, len 0, h:  methods[1]: 
-    // parsed:, offset 213, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 215, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 217, len 2, h: descriptor: (I)I
-    // .  .  
-       00 0d 
-    // parsed:, offset 219, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 221, len 0, h:  attributes[0]: 
-        // parsed:, offset 221, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 223, len 4, h: length: 00000037
-        // .  .  .  7  
-           00 00 00 37 
-        // parsed:, offset 227, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 229, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 231, len 4, h: code_length: 0000002b
-        // .  .  .  +  
-           00 00 00 2b 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 35, h: 0001: lookupswitch   -00000001: 0024   +0000000a: 0026   +0000000f: 0026   default: 0029
-        // .  .  .  .  .  .  (  .  .  .  .  .  .  .  .  .  .  .  #  .  .  .  .  .  .  .  %  .  .  .  .  .  .  .  %  
-//@mod           ab 00 00 00 00 00 28 00 00 00 03 ff ff ff ff 00 00 00 23 00 00 00 0a 00 00 00 25 00 00 00 0f 00 00 00 25 
-           ab 00 00 00 00 00 28 ff ff ff ff ff ff ff ff 00 00 00 23 00 00 00 0a 00 00 00 25 00 00 00 0f 00 00 00 25 
-        // parsed:, offset 36, len 1, h: 0024: iconst_2 // #+02
-        // .  
-           05 
-        // parsed:, offset 37, len 1, h: 0025: ireturn
-        // .  
-           ac 
-        // parsed:, offset 38, len 2, h: 0026: bipush #+14
-        // .  .  
-           10 14 
-        // parsed:, offset 40, len 1, h: 0028: ireturn
-        // .  
-           ac 
-        // parsed:, offset 41, len 1, h: 0029: iconst_m1 // #-01
-        // .  
-           02 
-        // parsed:, offset 42, len 1, h: 002a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 278, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 280, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 282, len 0, h: end attributes[0] 
-// parsed:, offset 282, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)I
-// parsed:, offset 282, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 284, len 0, h:  attributes[0]: 
-    // parsed:, offset 284, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 286, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 290, len 2, h: source: utf8{"T_lookupswitch_6.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 292, len 0, h: end attributes[0] 
-// parsed:, offset 292, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6.j
deleted file mode 100644
index dde35ca..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6.j
+++ /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_lookupswitch_6.java
-.class public dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-
-    lookupswitch
-            -1 : Label0
-            10 : Label1
-            15 : Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6.java
deleted file mode 100644
index 5fa0f3d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_6.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 dxc.junit.opcodes.lookupswitch.jm;
-
-public class T_lookupswitch_6 {
-
-    public int run(int i) {
-        switch (i) {
-        case -1:
-            return 2;
-        case 10:
-        case 15:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7.cfh b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7.cfh
deleted file mode 100644
index 278dc9b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0b 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 3, h: 0006: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_7}
-    // .  .  .  
-       07 00 0c 
-    // parsed:, offset 65, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0a 
-    // parsed:, offset 70, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 77, len 24, h: 0009: utf8{"T_lookupswitch_7.java"}
-    // .  .  .  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  7  .  j  a  v  a  
-       01 00 15 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 37 2e 6a 61 76 61 
-    // parsed:, offset 101, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 107, len 3, h: 000b: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 110, len 53, h: 000c: utf8{"dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7"}
-    // .  .  2  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  o  o  k  u  p  s  w  i  t  c  h  /  j  m  /  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  7  
-       01 00 32 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 37 
-    // parsed:, offset 163, len 7, h: 000d: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-// parsed:, offset 170, len 0, h: end constant_pool
-// parsed:, offset 170, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 172, len 2, h: this_class: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_7}
-// .  .  
-   00 06 
-// parsed:, offset 174, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0b 
-// parsed:, offset 176, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 178, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 180, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 182, len:110,desc: ()V
-// parsed:, offset 182, len 0, h:  methods[0]: 
-    // parsed:, offset 182, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 184, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 186, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 188, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 190, len 0, h:  attributes[0]: 
-        // parsed:, offset 190, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 192, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 196, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 198, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 200, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 209, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 211, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 213, len 0, h: end attributes[0] 
-// parsed:, offset 213, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 213, len:79,desc: (I)I
-// parsed:, offset 213, len 0, h:  methods[1]: 
-    // parsed:, offset 213, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 215, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 217, len 2, h: descriptor: (I)I
-    // .  .  
-       00 0d 
-    // parsed:, offset 219, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 221, len 0, h:  attributes[0]: 
-        // parsed:, offset 221, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 223, len 4, h: length: 00000037
-        // .  .  .  7  
-           00 00 00 37 
-        // parsed:, offset 227, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 229, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 231, len 4, h: code_length: 0000002b
-        // .  .  .  +  
-           00 00 00 2b 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 35, h: 0001: lookupswitch   -00000001: 0024   +0000000a: 0026   +0000000f: 0026   default: 0029
-        // .  .  .  .  .  .  (  .  .  .  .  .  .  .  .  .  .  .  #  .  .  .  .  .  .  .  %  .  .  .  .  .  .  .  %  
-//@mod           ab 00 00 00 00 00 28 00 00 00 03 ff ff ff ff 00 00 00 23 00 00 00 0a 00 00 00 25 00 00 00 0f 00 00 00 25 
-           ab 01 00 00 00 00 28 00 00 00 03 ff ff ff ff 00 00 00 23 00 00 00 0a 00 00 00 25 00 00 00 0f 00 00 00 25 
-        // parsed:, offset 36, len 1, h: 0024: iconst_2 // #+02
-        // .  
-           05 
-        // parsed:, offset 37, len 1, h: 0025: ireturn
-        // .  
-           ac 
-        // parsed:, offset 38, len 2, h: 0026: bipush #+14
-        // .  .  
-           10 14 
-        // parsed:, offset 40, len 1, h: 0028: ireturn
-        // .  
-           ac 
-        // parsed:, offset 41, len 1, h: 0029: iconst_m1 // #-01
-        // .  
-           02 
-        // parsed:, offset 42, len 1, h: 002a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 278, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 280, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 282, len 0, h: end attributes[0] 
-// parsed:, offset 282, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)I
-// parsed:, offset 282, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 284, len 0, h:  attributes[0]: 
-    // parsed:, offset 284, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 286, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 290, len 2, h: source: utf8{"T_lookupswitch_7.java"}
-    // .  .  
-       00 09 
-// parsed:, offset 292, len 0, h: end attributes[0] 
-// parsed:, offset 292, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7.j b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7.j
deleted file mode 100644
index 5dfd4df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7.j
+++ /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_lookupswitch_7.java
-.class public dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-
-    lookupswitch
-            -1 : Label0
-            10 : Label1
-            15 : Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_7.java
deleted file mode 100644
index 105db5e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_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 dxc.junit.opcodes.lookupswitch.jm;
-
-public class T_lookupswitch_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/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8.cfh b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8.cfh
deleted file mode 100644
index b03b95c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0a 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 3, h: 0005: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_8}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 59, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 65, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 09 
-    // parsed:, offset 70, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 77, len 6, h: 0009: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 83, len 3, h: 000a: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 86, len 53, h: 000b: utf8{"dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8"}
-    // .  .  2  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  l  o  o  k  u  p  s  w  i  t  c  h  /  j  m  /  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  8  
-       01 00 32 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 38 
-    // parsed:, offset 139, len 24, h: 000c: utf8{"T_lookupswitch_8.java"}
-    // .  .  .  T  _  l  o  o  k  u  p  s  w  i  t  c  h  _  8  .  j  a  v  a  
-       01 00 15 54 5f 6c 6f 6f 6b 75 70 73 77 69 74 63 68 5f 38 2e 6a 61 76 61 
-    // parsed:, offset 163, len 7, h: 000d: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-// parsed:, offset 170, len 0, h: end constant_pool
-// parsed:, offset 170, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 172, len 2, h: this_class: type{dxc.junit.opcodes.lookupswitch.jm.T_lookupswitch_8}
-// .  .  
-   00 05 
-// parsed:, offset 174, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0a 
-// parsed:, offset 176, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 178, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 180, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 182, len:110,desc: ()V
-// parsed:, offset 182, len 0, h:  methods[0]: 
-    // parsed:, offset 182, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 184, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 186, len 2, h: descriptor: ()V
-    // .  .  
-       00 09 
-    // parsed:, offset 188, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 190, len 0, h:  attributes[0]: 
-        // parsed:, offset 190, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 192, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 196, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 198, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 200, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 209, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 211, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 213, len 0, h: end attributes[0] 
-// parsed:, offset 213, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 213, len:79,desc: (I)I
-// parsed:, offset 213, len 0, h:  methods[1]: 
-    // parsed:, offset 213, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 215, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 217, len 2, h: descriptor: (I)I
-    // .  .  
-       00 0d 
-    // parsed:, offset 219, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 221, len 0, h:  attributes[0]: 
-        // parsed:, offset 221, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 223, len 4, h: length: 00000037
-        // .  .  .  7  
-           00 00 00 37 
-        // parsed:, offset 227, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 229, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 231, len 4, h: code_length: 0000002b
-        // .  .  .  +  
-           00 00 00 2b 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 35, h: 0001: lookupswitch   -00000001: 0024   +0000000a: 0026   +0000000f: 0026   default: 0029
-        // .  .  .  .  .  .  (  .  .  .  .  .  .  .  .  .  .  .  #  .  .  .  .  .  .  .  %  .  .  .  .  .  .  .  %  
-//@mod           ab 00 00 00 00 00 28 00 00 00 03 ff ff ff ff 00 00 00 23 00 00 00 0a 00 00 00 25 00 00 00 0f 00 00 00 25 
-           ab 00 00 00 00 00 28 00 00 00 03 ff ff ff ff 00 00 00 23 00 00 00 0f 00 00 00 25 00 00 00 0a 00 00 00 25 
-        // parsed:, offset 36, len 1, h: 0024: iconst_2 // #+02
-        // .  
-           05 
-        // parsed:, offset 37, len 1, h: 0025: ireturn
-        // .  
-           ac 
-        // parsed:, offset 38, len 2, h: 0026: bipush #+14
-        // .  .  
-           10 14 
-        // parsed:, offset 40, len 1, h: 0028: ireturn
-        // .  
-           ac 
-        // parsed:, offset 41, len 1, h: 0029: iconst_m1 // #-01
-        // .  
-           02 
-        // parsed:, offset 42, len 1, h: 002a: ireturn
-        // .  
-           ac 
-        // parsed:, offset 278, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 280, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 282, len 0, h: end attributes[0] 
-// parsed:, offset 282, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)I
-// parsed:, offset 282, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 284, len 0, h:  attributes[0]: 
-    // parsed:, offset 284, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 286, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 290, len 2, h: source: utf8{"T_lookupswitch_8.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 292, len 0, h: end attributes[0] 
-// parsed:, offset 292, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8.j b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8.j
deleted file mode 100644
index 9213d50..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8.j
+++ /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_lookupswitch_8.java
-.class public dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-
-    lookupswitch
-            -1 : Label0
-            10 : Label1
-            15 : Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_8.java
deleted file mode 100644
index 13a1255..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_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 dxc.junit.opcodes.lookupswitch.jm;
-
-public class T_lookupswitch_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/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_9.j b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_9.j
deleted file mode 100644
index 9359025..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_9.j
+++ /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_lookupswitch_9.java
-.class public dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    lookupswitch
-            -1 : Label0
-            10 : Label1
-            15 : Label1
-            default: Label3
-
-    Label0:
-.line 8
-    iconst_2
-    ireturn
-
-    Label1:
-.line 11
-    bipush 20
-    ireturn
-
-    Label3:
-.line 13
-    iconst_m1
-
-    Label5:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_9.java b/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_9.java
deleted file mode 100644
index e6dca83..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lookupswitch/jm/T_lookupswitch_9.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 dxc.junit.opcodes.lookupswitch.jm;
-
-public class T_lookupswitch_9 {
-    
-    public int run(int i) {
-        switch (i) {
-        case -1:
-            return 2;
-        case 10:
-        case 15:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/Test_lor.java b/tools/dx-tests/src/dxc/junit/opcodes/lor/Test_lor.java
deleted file mode 100644
index 6c39754..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/Test_lor.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 dxc.junit.opcodes.lor;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lor.jm.T_lor_1;
-
-public class Test_lor extends DxTestCase {
-
-    /**
-     * @title Arguments = 123456789121l, 2l
-     */
-    public void testN1() {
-        T_lor_1 t = new T_lor_1();
-        assertEquals(123456789123l, t.run(123456789121l, 2l));
-    }
-
-    /**
-     * @title Arguments = 0xffffffffffffff8l, 0xffffffffffffff1l
-     */
-    public void testN2() {
-        T_lor_1 t = new T_lor_1();
-        assertEquals(0xffffffffffffff9l, t.run(0xffffffffffffff8l,
-                0xffffffffffffff1l));
-    }
-
-    /**
-     * @title  Arguments = 0xabcdefabcdef, -1
-     */
-    public void testN3() {
-        T_lor_1 t = new T_lor_1();
-        assertEquals(-1l, t.run(0xabcdefabcdefl, -1l));
-    }
-
-    /**
-     * @title  Arguments = 0, -1
-     */
-    public void testB1() {
-        T_lor_1 t = new T_lor_1();
-        assertEquals(-1l, t.run(0l, -1l));
-    }
-
-    /**
-     * @title  Arguments = Long.MAX_VALUE, Long.MIN_VALUE
-     */
-    public void testB2() {
-        T_lor_1 t = new T_lor_1();
-        assertEquals(-1l, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lor.jm.T_lor_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & long
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lor.jm.T_lor_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int & long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lor.jm.T_lor_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float & long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lor.jm.T_lor_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference & long
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lor.jm.T_lor_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_1.j
deleted file mode 100644
index b2bf3b6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_1.j
+++ /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_lor_1.java
-.class public dxc/junit/opcodes/lor/jm/T_lor_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    lload_3
-    lor
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_1.java
deleted file mode 100644
index ca5c203..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_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 dxc.junit.opcodes.lor.jm;
-
-public class T_lor_1 {
-
-    public long run(long a, long b) {
-        return a | b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_2.j
deleted file mode 100644
index f706ad6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_2.j
+++ /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_lor_2.java
-.class public dxc/junit/opcodes/lor/jm/T_lor_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-;    lload_1
-    lload_3
-    lor
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_2.java
deleted file mode 100644
index 9124f10..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_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 dxc.junit.opcodes.lor.jm;
-
-public class T_lor_2 {
-
-    public long run(long a, long b) {
-        return a | b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_3.j
deleted file mode 100644
index da974e4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_3.j
+++ /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_lor_3.java
-.class public dxc/junit/opcodes/lor/jm/T_lor_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DJ)J
-    .limit stack 4
-    .limit locals 5
-
-    dload_1
-    lload_3
-    lor
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_3.java
deleted file mode 100644
index 99cf176..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_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 dxc.junit.opcodes.lor.jm;
-
-public class T_lor_3 {
-
-    public long run(double a, long b) {
-        return (long)a | b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_4.j
deleted file mode 100644
index b60b092..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_4.j
+++ /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_lor_4.java
-.class public dxc/junit/opcodes/lor/jm/T_lor_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(IJ)J
-    .limit stack 4
-    .limit locals 4
-
-    iload_1
-    lload_2
-    lor
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_4.java
deleted file mode 100644
index e37f8f6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_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 dxc.junit.opcodes.lor.jm;
-
-public class T_lor_4 {
-
-    public long run(int a, long b) {
-        return a | b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_5.j
deleted file mode 100644
index 62376b9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_5.j
+++ /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_lor_5.java
-.class public dxc/junit/opcodes/lor/jm/T_lor_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FJ)J
-    .limit stack 4
-    .limit locals 4
-
-    fload_1
-    lload_2
-    lor
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_5.java
deleted file mode 100644
index db49535..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_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 dxc.junit.opcodes.lor.jm;
-
-public class T_lor_5 {
-
-    public long run(float a, long b) {
-        return (long)a | b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_6.j
deleted file mode 100644
index c03fcc6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lor_6.java
-.class public dxc/junit/opcodes/lor/jm/T_lor_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    aload_0
-    lload_3
-    lor
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_6.java
deleted file mode 100644
index 8918dd6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lor/jm/T_lor_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 dxc.junit.opcodes.lor.jm;
-
-public class T_lor_6 {
-
-    public long run(long a, long b) {
-        return a | b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/Test_lrem.java b/tools/dx-tests/src/dxc/junit/opcodes/lrem/Test_lrem.java
deleted file mode 100644
index 1c9346d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/Test_lrem.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 dxc.junit.opcodes.lrem;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lrem.jm.T_lrem_1;
-
-public class Test_lrem extends DxTestCase {
-
-    /**
-     * @title Arguments = 10000000000l, 4000000000l
-     */
-    public void testN1() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(2000000000l, t.run(10000000000l, 4000000000l));
-    }
-
-    /**
-     * @title Arguments = 1234567890123l, 123456789l
-     */
-    public void testN2() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(123l, t.run(1234567890123l, 123456789l));
-    }
-
-    /**
-     * @title  Dividend = 0
-     */
-    public void testN3() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(0l, t.run(0l, 1234567890123l));
-    }
-
-    /**
-     * @title  Dividend is negative
-     */
-    public void testN4() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(-2000000000l, t.run(-10000000000l, 4000000000l));
-    }
-
-    /**
-     * @title  Divisor is negative
-     */
-    public void testN5() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(2000000000l, t.run(10000000000l, -4000000000l));
-    }
-
-    /**
-     * @title  Both Dividend and divisor are negative
-     */
-    public void testN6() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(-2000000000l, t.run(-10000000000l, -4000000000l));
-    }
-
-    /**
-     * @title Arguments = Long.MIN_VALUE, -1l
-     */
-    public void testB1() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(0l, t.run(Long.MIN_VALUE, -1l));
-    }
-    /**
-     * @title Arguments = Long.MIN_VALUE, 1l
-     */
-    public void testB2() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(0l, t.run(Long.MIN_VALUE, 1l));
-    }
-    /**
-     * @title Arguments = Long.MAX_VALUE, 1l
-     */
-    public void testB3() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(0l, t.run(Long.MAX_VALUE, 1l));
-    }
-    /**
-     * @title Arguments = Long.MIN_VALUE, Long.MAX_VALUE
-     */
-    public void testB4() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(-1l, t.run(Long.MIN_VALUE, Long.MAX_VALUE));
-    }
-    /**
-     * @title Arguments = 1l, Long.MAX_VALUE
-     */
-    public void testB5() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(1l, t.run(1l, Long.MAX_VALUE));
-    }
-    /**
-     * @title Arguments = 1l, Long.MIN_VALUE
-     */
-    public void testB6() {
-        T_lrem_1 t = new T_lrem_1();
-        assertEquals(1l, t.run(1l, Long.MIN_VALUE));
-    }
-
-    /**
-     * @title  Divisor is 0
-     */
-    public void testE1() {
-        T_lrem_1 t = new T_lrem_1();
-        try {
-            t.run(1234567890123l, 0l);
-            fail("expected ArithmeticException");
-        } catch (ArithmeticException ae) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lrem.jm.T_lrem_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lrem.jm.T_lrem_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int / long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lrem.jm.T_lrem_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long / float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lrem.jm.T_lrem_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference / float
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lrem.jm.T_lrem_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_1.j
deleted file mode 100644
index c675add..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_1.j
+++ /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_lrem_1.java
-.class public dxc/junit/opcodes/lrem/jm/T_lrem_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    lload_3
-    lrem
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_1.java
deleted file mode 100644
index d4a6114..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_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 dxc.junit.opcodes.lrem.jm;
-
-public class T_lrem_1 {
-
-    public long run(long a, long b) {
-        return a % b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_2.j
deleted file mode 100644
index 8612604..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_2.j
+++ /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_lrem_2.java
-.class public dxc/junit/opcodes/lrem/jm/T_lrem_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-;    lload_1
-    lload_3
-    lrem
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_2.java
deleted file mode 100644
index 4f9a924..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_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 dxc.junit.opcodes.lrem.jm;
-
-public class T_lrem_2 {
-
-    public long run(long a, long b) {
-        return a % b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_3.j
deleted file mode 100644
index 6b51605..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_3.j
+++ /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_lrem_3.java
-.class public dxc/junit/opcodes/lrem/jm/T_lrem_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JD)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    dload_3
-    lrem
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_3.java
deleted file mode 100644
index 5b6d8df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_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 dxc.junit.opcodes.lrem.jm;
-
-public class T_lrem_3 {
-
-    public long run(long a, double b) {
-        return (long) (a % b);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_4.j
deleted file mode 100644
index 3fcffc5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_4.j
+++ /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_lrem_4.java
-.class public dxc/junit/opcodes/lrem/jm/T_lrem_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(IJ)J
-    .limit stack 4
-    .limit locals 4
-
-    iload_1
-    lload_2
-    lrem
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_4.java
deleted file mode 100644
index 6e5990d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_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 dxc.junit.opcodes.lrem.jm;
-
-public class T_lrem_4 {
-
-    public long run(int a, long b) {
-        return a % b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_5.j
deleted file mode 100644
index 10841d5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_5.j
+++ /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_lrem_5.java
-.class public dxc/junit/opcodes/lrem/jm/T_lrem_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JF)J
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-    fload_3
-    lrem
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_5.java
deleted file mode 100644
index e3267dd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_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 dxc.junit.opcodes.lrem.jm;
-
-public class T_lrem_5 {
-
-    public long run(long a, float b) {
-        return (long) (a % b);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_6.j
deleted file mode 100644
index 6b329d6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lrem_6.java
-.class public dxc/junit/opcodes/lrem/jm/T_lrem_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    aload_0
-    lload_3
-    lrem
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_6.java
deleted file mode 100644
index b9d3b17..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lrem/jm/T_lrem_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 dxc.junit.opcodes.lrem.jm;
-
-public class T_lrem_6 {
-
-    public long run(long a, long b) {
-        return a % b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/Test_lreturn.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/Test_lreturn.java
deleted file mode 100644
index 805c4a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/Test_lreturn.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 dxc.junit.opcodes.lreturn;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lreturn.jm.T_lreturn_1;
-import dxc.junit.opcodes.lreturn.jm.T_lreturn_6;
-import dxc.junit.opcodes.lreturn.jm.T_lreturn_7;
-import dxc.junit.opcodes.lreturn.jm.T_lreturn_8;
-import dxc.junit.opcodes.lreturn.jm.T_lreturn_9;
-
-public class Test_lreturn extends DxTestCase {
-
-    /**
-     * @title  simple
-     */
-    public void testN1() {
-        T_lreturn_1 t = new T_lreturn_1();
-        assertEquals(12345612345l, t.run());
-    }
-
-    /**
-     * @title  check that frames are discarded and reinstananted correctly
-     */
-    public void testN2() {
-        T_lreturn_6 t = new T_lreturn_6();
-        assertEquals(0l, t.run());
-    }
-
-    /**
-     * @title  check that monitor is released by lreturn
-     */
-    public void testN3() {
-        assertTrue(T_lreturn_7.execute());
-    }
-
-
-    /**
-     * @title  Method is synchronized but thread is not monitor owner
-     */
-    public void testE1() {
-        T_lreturn_8 t = new T_lreturn_8();
-        try {
-            assertTrue(t.run());
-            fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Lock structural rule 1 is violated
-     */
-// Dalvik currently does not support structured locks, so we remove this test.    
-//    public void testE2() {
-//        T_lreturn_9 t = new T_lreturn_9();
-//        try {
-//            assertEquals(1d, t.run());
-//            // the JVM spec says that it is optional to implement the structural
-//            // lock rules, see JVM spec 8.13 and monitorenter/exit opcodes.
-//            System.out.print("dvmvfe:");
-//            //fail("expected IllegalMonitorStateException");
-//        } catch (IllegalMonitorStateException imse) {
-//            // expected
-//        }
-//    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - void
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lreturn.jm.T_lreturn_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lreturn.jm.T_lreturn_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lreturn.jm.T_lreturn_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lreturn.jm.T_lreturn_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lreturn.jm.T_lreturn_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - reference
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.lreturn.jm.T_lreturn_11");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_1.j
deleted file mode 100644
index 1049bf3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_1.j
+++ /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_lreturn_1.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 2
-    
-    ldc2_w 12345612345
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_1.java
deleted file mode 100644
index 5fb565d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_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 dxc.junit.opcodes.lreturn.jm;
-
-public class T_lreturn_1 {
-
-    public long run() {
-        return 12345612345l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_10.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_10.j
deleted file mode 100644
index d855369..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_10.j
+++ /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_lreturn_10.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_10
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private static test()J
-    .limit stack 2
-    .limit locals 0
-    
-    lconst_1
-    lreturn
-    
-.end method
-
-
-.method public run()J
-    .limit stack 0
-    .limit locals 1
-
-    invokestatic dxc/junit/opcodes/lreturn/jm/T_lreturn_10/test()J
-    lreturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_10.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_10.java
deleted file mode 100644
index 5949439..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_10.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 dxc.junit.opcodes.lreturn.jm;
-
-public class T_lreturn_10 {
-    
-    private static long test() {
-        return 1l;
-    }
-    
-    public long run() {
-        return test();
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_11.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_11.j
deleted file mode 100644
index 68dfcd4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_11.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lreturn_11.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()J
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_11.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_11.java
deleted file mode 100644
index 0b1c976..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_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 dxc.junit.opcodes.lreturn.jm;
-
-public class T_lreturn_11 {
-    
-    public long run() {
-        return 0l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_2.j
deleted file mode 100644
index 117d3fc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lreturn_2.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    lconst_0
-    lreturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_2.java
deleted file mode 100644
index 778ee8f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_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 dxc.junit.opcodes.lreturn.jm;
-
-public class T_lreturn_2 {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_3.j
deleted file mode 100644
index b9a758c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_3.j
+++ /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_lreturn_3.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    return
-.end method
-
-
-.method public run()F
-    .limit stack 2
-    .limit locals 1
-
-    lconst_0
-    lreturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_3.java
deleted file mode 100644
index 1708e8a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_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 dxc.junit.opcodes.lreturn.jm;
-
-public class T_lreturn_3 {
-
-   
-    public long run() {
-        return 0l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_4.j
deleted file mode 100644
index 1776541..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lreturn_4.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 2
-    .limit locals 1
-
-    ;lconst_0
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_4.java
deleted file mode 100644
index c7ad19c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_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 dxc.junit.opcodes.lreturn.jm;
-
-public class T_lreturn_4 {
-
-    public long run() {
-        return 0l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_5.j
deleted file mode 100644
index 16c1340..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_5.j
+++ /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_lreturn_5.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 2
-    .limit locals 1
-
-    fconst_0
-    lreturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_5.java
deleted file mode 100644
index c1cb526..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_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 dxc.junit.opcodes.lreturn.jm;
-
-public class T_lreturn_5 {
-
-    public long run() {
-        return 0l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_6.j
deleted file mode 100644
index 6c7fed7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_6.j
+++ /dev/null
@@ -1,93 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lreturn_6.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit locals 12
-    .limit stack 6
-    
-    lconst_1
-    lstore_1
-    ldc2_w 22222222222
-    lstore_3
-    ldc2_w 33333333333
-    lstore 5
-    
-    ldc2_w 44444444444
-    
-    invokestatic dxc/junit/opcodes/lreturn/jm/T_lreturn_6/test()J
-    
-    ldc2_w 4444444444444
-    lcmp
-    ifne Label1
-    
-    ldc2_w 44444444444
-    lcmp
-    ifne Label0
-    
-    lload_1
-    lconst_1
-    lcmp
-    ifne Label0
-    
-    lload_3
-    ldc2_w 22222222222
-    lcmp
-    ifne Label0
-    
-    lload 5
-    ldc2_w 33333333333
-    lcmp
-    ifne Label0    
-    
-    ldc2_w 12345612345
-    lreturn
-
-Label1:
-    pop2
-Label0:
-    lconst_0
-    lreturn
-
-.end method
-
-
-.method private static test()J
-    .limit locals 8
-    .limit stack 4
-    
-    ldc2_w 11111111111
-    lstore_1
-    ldc2_w 22222222222
-    lstore_3
-    ldc2_w 33333333333
-    lstore 5
-    
-    ldc2_w 55555555555
-    
-    ldc2_w 44444444444
-    lreturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_6.java
deleted file mode 100644
index 2461760..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_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 dxc.junit.opcodes.lreturn.jm;
-
-public class T_lreturn_6 {
-
-    public long run() {
-        return 12345612345l;
-    }
-    
-    private static long test() {
-        long a = 11111111111l;
-        long b = 22222222222l;
-        long c = 33333333333l;
-        return 44444444444l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_7.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_7.j
deleted file mode 100644
index 70e857c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_7.j
+++ /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.
-
-.source T_lreturn_7.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_7
-.super java/lang/Object
-.implements java/lang/Runnable
-
-.field  value J
-.field  failed Z
-
-.method public <init>()V
-    .limit stack 3
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    lconst_0
-    putfield dxc.junit.opcodes.lreturn.jm.T_lreturn_7.value J
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.lreturn.jm.T_lreturn_7.failed Z
-
-    return
-
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-   
-    iconst_0
-    istore_1
-
-Label4:
-    iload_1
-    sipush 1000
-    if_icmpge Label3
-
-    aload_0
-    invokespecial dxc/junit/opcodes/lreturn/jm/T_lreturn_7/test()J
-    pop2
-
-    iinc 1 1
-
-    goto Label4
-
-
-Label3:
-    return
-
-.end method
-
-
-
-.method private synchronized test()J
-    .limit stack 5
-    .limit locals 3
-    
-.line 16
-    aload_0
-    dup
-    getfield dxc.junit.opcodes.lreturn.jm.T_lreturn_7.value J
-    dup2
-    lstore_1
-
-    lconst_1
-    ladd
-    putfield dxc.junit.opcodes.lreturn.jm.T_lreturn_7.value J
-
-    lload_1
-    lconst_1
-    ladd
-    lstore_1
-
-    invokestatic java/lang/Thread/yield()V
-
-    lload_1
-    aload_0
-    getfield dxc.junit.opcodes.lreturn.jm.T_lreturn_7.value J
-    lcmp
-    ifeq Label0
-
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.lreturn.jm.T_lreturn_7.failed Z
-
-Label0:
-    lload_1
-    lreturn
-.end method
-
-
-.method public static execute()Z
-    .limit stack 5
-    .limit locals 4
-
-    new dxc/junit/opcodes/lreturn/jm/T_lreturn_7
-    dup
-    invokespecial dxc/junit/opcodes/lreturn/jm/T_lreturn_7/<init>()V
-    astore_0
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_1
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_2
-
-    aload_1
-    invokevirtual java/lang/Thread/start()V
-
-    aload_2
-    invokevirtual java/lang/Thread/start()V
-
-Label12:
-    ldc2_w 5000
-    invokestatic java/lang/Thread/sleep(J)V
-
-Label13:
-    goto Label0
-
-Label14:            ; exception handler
-    astore_3
-    goto Label3
-
-Label0:
-    aload_0
-    getfield dxc.junit.opcodes.lreturn.jm.T_lreturn_7.value J
-    ldc2_w 2000
-    lcmp
-    ifne Label3
-
-    aload_0
-    getfield dxc.junit.opcodes.lreturn.jm.T_lreturn_7.failed Z
-    ifne Label3
-
-    iconst_1
-    ireturn
-
-Label3:
-    iconst_0
-    ireturn
-
-.catch java/lang/InterruptedException from Label12 to Label13 using Label14
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_7.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_7.java
deleted file mode 100644
index fc97b6e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_7.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 dxc.junit.opcodes.lreturn.jm;
-
-import dxc.junit.opcodes.lreturn.jm.T_lreturn_7;
-
-public class T_lreturn_7 implements Runnable {
-    public final static int CNT = 1000;
-    long value = 0;
-    boolean failed = false;
-    
-    public void run() {
-        for(int i = 0; i < CNT; i++) {
-            test();
-        }
-    }
-    
-    private synchronized long test()  {
-        value++;
-        long c = value;
-        Thread.yield();
-        if(c != value)
-            failed = true;
-        return c;
-    }
-    
-    public static boolean execute() {
-        T_lreturn_7 test = new T_lreturn_7();
-        Thread t1 = new Thread(test);
-        Thread t2 = new Thread(test);
-        
-        t1.start();
-        t2.start();
-        
-        try
-        {
-            Thread.sleep(5000);
-        }
-        catch(InterruptedException ie) {
-            return false;
-        }
-        
-        if(test.value != CNT * 2)
-            return false;
-        return !test.failed;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_8.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_8.j
deleted file mode 100644
index 6b7597c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_8.j
+++ /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_lreturn_8.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_8
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private synchronized test()J
-    .limit stack 2
-    
-    aload_0
-    monitorexit
-       lconst_0
-    lreturn
-.end method
-
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial dxc/junit/opcodes/lreturn/jm/T_lreturn_8/test()J
-    pop2
-
-    iconst_1
-    ireturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_8.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_8.java
deleted file mode 100644
index 1653cb1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_8.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 dxc.junit.opcodes.lreturn.jm;
-
-public class T_lreturn_8 {
-    
-    private synchronized long test() {
-        return 0l;
-    }
-    
-    public boolean run() {
-        test();
-        return true;
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_9.j b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_9.j
deleted file mode 100644
index 17dfe86..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_9.j
+++ /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_lreturn_9.java
-.class public dxc/junit/opcodes/lreturn/jm/T_lreturn_9
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()J
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    monitorenter
-
-    lconst_1
-    lreturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_9.java b/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_9.java
deleted file mode 100644
index df514b4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lreturn/jm/T_lreturn_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 dxc.junit.opcodes.lreturn.jm;
-
-public class T_lreturn_9 {
-    
-    public long run() {
-        return 1l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/Test_lshl.java b/tools/dx-tests/src/dxc/junit/opcodes/lshl/Test_lshl.java
deleted file mode 100644
index df45a03..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/Test_lshl.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 dxc.junit.opcodes.lshl;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lshl.jm.T_lshl_1;
-
-public class Test_lshl extends DxTestCase {
-
-    /**
-     * @title Arguments = 5000000000l, 3
-     */
-    public void testN1() {
-        T_lshl_1 t = new T_lshl_1();
-        assertEquals(40000000000l, t.run(5000000000l, 3));
-    }
-
-    /**
-     * @title Arguments = 5000000000l, 1
-     */
-    public void testN2() {
-        T_lshl_1 t = new T_lshl_1();
-        assertEquals(10000000000l, t.run(5000000000l, 1));
-    }
-
-    /**
-     * @title Arguments = -5000000000l, 1
-     */
-    public void testN3() {
-        T_lshl_1 t = new T_lshl_1();
-        assertEquals(-10000000000l, t.run(-5000000000l, 1));
-    }
-
-    /**
-     * @title  Arguments = 1, -1
-     */
-    public void testN4() {
-        T_lshl_1 t = new T_lshl_1();
-        assertEquals(0x8000000000000000l, t.run(1l, -1));
-    }
-
-    /**
-     * @title  Verify that shift distance is actually in range 0 to 64.
-     */
-    public void testN5() {
-        T_lshl_1 t = new T_lshl_1();
-        assertEquals(130l, t.run(65l, 65));
-    }
-
-    /**
-     * @title  Arguments = 0, -1
-     */
-    public void testB1() {
-        T_lshl_1 t = new T_lshl_1();
-        assertEquals(0, t.run(0, -1));
-    }
-
-    /**
-     * @title  Arguments = 1, 0
-     */
-    public void testB2() {
-        T_lshl_1 t = new T_lshl_1();
-        assertEquals(1, t.run(1, 0));
-    }
-
-    /**
-     * @title  Arguments = Long.MAX_VALUE, 1
-     */
-    public void testB3() {
-        T_lshl_1 t = new T_lshl_1();
-        assertEquals(0xfffffffe, t.run(Long.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title  Arguments = Long.MIN_VALUE, 1
-     */
-    public void testB4() {
-        T_lshl_1 t = new T_lshl_1();
-        assertEquals(0l, t.run(Long.MIN_VALUE, 1));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lshl.jm.T_lshl_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lshl.jm.T_lshl_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int & int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lshl.jm.T_lshl_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float & int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lshl.jm.T_lshl_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference & int
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lshl.jm.T_lshl_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_1.j
deleted file mode 100644
index 47ea4ff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_1.j
+++ /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_lshl_1.java
-.class public dxc/junit/opcodes/lshl/jm/T_lshl_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JI)J
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-    iload_3
-    lshl
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_1.java
deleted file mode 100644
index 5855d09..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_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 dxc.junit.opcodes.lshl.jm;
-
-public class T_lshl_1 {
-
-    public long run(long a, int b) {
-        return a << b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_2.j
deleted file mode 100644
index cb0a00c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_2.j
+++ /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_lshl_2.java
-.class public dxc/junit/opcodes/lshl/jm/T_lshl_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JI)J
-    .limit stack 3
-    .limit locals 4
-
-;    lload_1
-    iload_3
-    lshl
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_2.java
deleted file mode 100644
index 42d89f0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_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 dxc.junit.opcodes.lshl.jm;
-
-public class T_lshl_2 {
-
-    public long run(long a, int b) {
-        return a << b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_3.j
deleted file mode 100644
index a5d5200..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_3.j
+++ /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_lshl_3.java
-.class public dxc/junit/opcodes/lshl/jm/T_lshl_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DI)J
-    .limit stack 3
-    .limit locals 4
-
-    dload_1
-    iload_3
-    lshl
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_3.java
deleted file mode 100644
index 0de1686..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_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 dxc.junit.opcodes.lshl.jm;
-
-public class T_lshl_3 {
-
-    public long run(double a, int b) {
-        return (long)a << b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_4.j
deleted file mode 100644
index 6ff06c7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_4.j
+++ /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_lshl_4.java
-.class public dxc/junit/opcodes/lshl/jm/T_lshl_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)J
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    lshl
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_4.java
deleted file mode 100644
index a7a4fcf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_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 dxc.junit.opcodes.lshl.jm;
-
-public class T_lshl_4 {
-
-    public long run(int a, int b) {
-        return a << b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_5.j
deleted file mode 100644
index 6461614..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_5.j
+++ /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_lshl_5.java
-.class public dxc/junit/opcodes/lshl/jm/T_lshl_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FI)J
-    .limit stack 3
-    .limit locals 3
-
-    fload_1
-    iload_2
-    lshl
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_5.java
deleted file mode 100644
index f48ad7d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_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 dxc.junit.opcodes.lshl.jm;
-
-public class T_lshl_5 {
-
-    public long run(float a, int b) {
-        return (long)a << b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_6.j
deleted file mode 100644
index 6b3e135..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lshl_6.java
-.class public dxc/junit/opcodes/lshl/jm/T_lshl_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JI)J
-    .limit stack 3
-    .limit locals 4
-
-    aload_0
-    iload_3
-    lshl
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_6.java
deleted file mode 100644
index b27e156..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshl/jm/T_lshl_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 dxc.junit.opcodes.lshl.jm;
-
-public class T_lshl_6 {
-
-    public long run(long a, int b) {
-        return a << b;
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/Test_lshr.java b/tools/dx-tests/src/dxc/junit/opcodes/lshr/Test_lshr.java
deleted file mode 100644
index 5f98083..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/Test_lshr.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 dxc.junit.opcodes.lshr;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lshr.jm.T_lshr_1;
-
-public class Test_lshr extends DxTestCase {
-
-    /**
-     * @title Arguments = 40000000000l, 3
-     */
-    public void testN1() {
-        T_lshr_1 t = new T_lshr_1();
-        assertEquals(5000000000l, t.run(40000000000l, 3));
-    }
-
-    /**
-     * @title Arguments = 40000000000l, 1
-     */
-    public void testN2() {
-        T_lshr_1 t = new T_lshr_1();
-        assertEquals(20000000000l, t.run(40000000000l, 1));
-    }
-
-    /**
-     * @title Arguments = -40000000000l, 1
-     */
-    public void testN3() {
-        T_lshr_1 t = new T_lshr_1();
-        assertEquals(-20000000000l, t.run(-40000000000l, 1));
-    }
-
-    /**
-     * @title  Arguments = 1, -1
-     */
-    public void testN4() {
-        T_lshr_1 t = new T_lshr_1();
-        assertEquals(0l, t.run(1l, -1));
-    }
-
-    /**
-     * @title  Verify that shift distance is actually in range 0 to 64.
-     */
-    public void testN5() {
-        T_lshr_1 t = new T_lshr_1();
-        assertEquals(32, t.run(65l, 65));
-    }
-
-    /**
-     * @title  Arguments = 0, -1
-     */
-    public void testB1() {
-        T_lshr_1 t = new T_lshr_1();
-        assertEquals(0l, t.run(0l, -1));
-    }
-
-    /**
-     * @title  Arguments = 1, 0
-     */
-    public void testB2() {
-        T_lshr_1 t = new T_lshr_1();
-        assertEquals(1l, t.run(1l, 0));
-    }
-
-    /**
-     * @title  Arguments = Long.MAX_VALUE, 1
-     */
-    public void testB3() {
-        T_lshr_1 t = new T_lshr_1();
-        assertEquals(0x3FFFFFFFFFFFFFFFl, t.run(Long.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title  Arguments = Long.MIN_VALUE, 1
-     */
-    public void testB4() {
-        T_lshr_1 t = new T_lshr_1();
-        assertEquals(0xc000000000000000l, t.run(Long.MIN_VALUE, 1));
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lshr.jm.T_lshr_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lshr.jm.T_lshr_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int & int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lshr.jm.T_lshr_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float & int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lshr.jm.T_lshr_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference & int
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lshr.jm.T_lshr_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_1.j
deleted file mode 100644
index b21e884..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_1.j
+++ /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_lshr_1.java
-.class public dxc/junit/opcodes/lshr/jm/T_lshr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JI)J
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-    iload_3
-    lshr
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_1.java
deleted file mode 100644
index 45f4113..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_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 dxc.junit.opcodes.lshr.jm;
-
-public class T_lshr_1 {
-
-    public long run(long a, int b) {
-        return a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_2.j
deleted file mode 100644
index 21a59a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_2.j
+++ /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_lshr_2.java
-.class public dxc/junit/opcodes/lshr/jm/T_lshr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JI)J
-    .limit stack 3
-    .limit locals 4
-
-;    lload_1
-    iload_3
-    lshr
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_2.java
deleted file mode 100644
index 6c0243b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_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 dxc.junit.opcodes.lshr.jm;
-
-public class T_lshr_2 {
-
-    public long run(long a, int b) {
-        return a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_3.j
deleted file mode 100644
index 3edefd3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_3.j
+++ /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_lshr_3.java
-.class public dxc/junit/opcodes/lshr/jm/T_lshr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DI)J
-    .limit stack 3
-    .limit locals 4
-
-    dload_1
-    iload_3
-    lshr
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_3.java
deleted file mode 100644
index 8a2132d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_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 dxc.junit.opcodes.lshr.jm;
-
-public class T_lshr_3 {
-
-    public long run(double a, int b) {
-        return (long)a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_4.j
deleted file mode 100644
index 58349f5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_4.j
+++ /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_lshr_4.java
-.class public dxc/junit/opcodes/lshr/jm/T_lshr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)J
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    lshr
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_4.java
deleted file mode 100644
index 322a193b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_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 dxc.junit.opcodes.lshr.jm;
-
-public class T_lshr_4 {
-
-    public long run(int a, int b) {
-        return a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_5.j
deleted file mode 100644
index 179e48e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_5.j
+++ /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_lshr_5.java
-.class public dxc/junit/opcodes/lshr/jm/T_lshr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FI)J
-    .limit stack 3
-    .limit locals 3
-
-    fload_1
-    iload_2
-    lshr
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_5.java
deleted file mode 100644
index 0f97441..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_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 dxc.junit.opcodes.lshr.jm;
-
-public class T_lshr_5 {
-
-    public long run(float a, int b) {
-        return (long)a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_6.j
deleted file mode 100644
index 33c9991..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lshr_6.java
-.class public dxc/junit/opcodes/lshr/jm/T_lshr_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JI)J
-    .limit stack 3
-    .limit locals 4
-
-    aload_0
-    iload_3
-    lshr
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_6.java
deleted file mode 100644
index 31d5f9e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lshr/jm/T_lshr_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 dxc.junit.opcodes.lshr.jm;
-
-public class T_lshr_6 {
-
-    public long run(long a, int b) {
-        return a >> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/Test_lstore.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/Test_lstore.java
deleted file mode 100644
index 8d5ba1a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/Test_lstore.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lstore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lstore.jm.T_lstore_1;
-import dxc.junit.opcodes.lstore.jm.T_lstore_1_w;
-import dxc.junit.opcodes.lstore.jm.T_lstore_2;
-import dxc.junit.opcodes.lstore.jm.T_lstore_2_w;
-
-public class Test_lstore extends DxTestCase {
-
-    /*
-     * NORMAL ISTORE VERSION
-     */
-
-    /**
-     * @title  lstore 0
-     */
-    public void testN1() {
-        assertEquals(1234567890123l, T_lstore_1.run());
-    }
-
-    /**
-     * @title  lstore 255
-     */
-    public void testN2() {
-        assertEquals(1234567890123l, T_lstore_2.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore.jm.T_lstore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore.jm.T_lstore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore.jm.T_lstore_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore.jm.T_lstore_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /*
-     * WIDE ISTORE VERSION
-     */
-
-    /**
-     * @title  lstore_w 0
-     */
-    public void testN3() {
-        assertEquals(1234567890123l, T_lstore_1_w.run());
-    }
-
-    /**
-     * @title  lstore 257
-     */
-    public void testN4() {
-        assertEquals(1234567890123l, T_lstore_2_w.run());
-    }
-
-    /**
-     * @constraint 4.8.1.25
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore.jm.T_lstore_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore.jm.T_lstore_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore.jm.T_lstore_5_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore.jm.T_lstore_6_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1.j
deleted file mode 100644
index 02f5c5a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1.j
+++ /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_lstore_1.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 2
-    
-    ldc2_w 1234567890123
-
-    lstore 0
-    ldc2_w 4
-    lload 0
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1.java
deleted file mode 100644
index 7c1c4b7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_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 dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_1 {
-
-    public static long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1_w.j
deleted file mode 100644
index 24666bb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1_w.j
+++ /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_lstore_1_w.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_1_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 2
-
-    ldc2_w 1234567890123
-    lstore_w 0
-    ldc2_w 4
-    lload 0
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1_w.java
deleted file mode 100644
index 416a4e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_1_w.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 dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_1_w {
-    
-    public static long run() {
-        return 1234567890123l;
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2.j
deleted file mode 100644
index b0501e7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2.j
+++ /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_lstore_2.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 300
-
-    ldc2_w 1234567890123
-    lstore 255
-    ldc2_w 4
-    lload 255
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2.java
deleted file mode 100644
index 877fd84..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_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 dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_2 {
-
-    public static long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2_w.j
deleted file mode 100644
index 294ea0a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2_w.j
+++ /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_lstore_2_w.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_2_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 300
-    
-    ldc2_w 1234567890123
-    lstore_w 257
-    ldc2_w 4
-    lload 257
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2_w.java
deleted file mode 100644
index 369e5ef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_2_w.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 dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_2_w {
-    
-    public static long run() {
-        return 1234567890123l;
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3.j
deleted file mode 100644
index a3e1c91..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_3.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-    
-    lstore 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3.java
deleted file mode 100644
index a26dc24..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_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 dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3_w.j
deleted file mode 100644
index 782a123..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3_w.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_3_w.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_3_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    lstore_w 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3_w.java
deleted file mode 100644
index 717415a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_3_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_3_w {
-    public static void run() {
-
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4.j
deleted file mode 100644
index 15529ed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_4.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-    
-     dconst_1
-    lstore 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4.java
deleted file mode 100644
index 566f220..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_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 dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_4 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4_w.j
deleted file mode 100644
index 54bb0aa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_4_w.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_4_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-     dconst_1
-    lstore_w 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4_w.java
deleted file mode 100644
index cb56b27..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_4_w.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 dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_4_w {
-    public static void run() {
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5.j
deleted file mode 100644
index f4017d7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_5.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    iconst_1
-    lstore 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5.java
deleted file mode 100644
index ad183ea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5.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 dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_5 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5_w.j
deleted file mode 100644
index 7ada7ba..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_5_w.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_5_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-     iconst_1
-    lstore_w 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5_w.java
deleted file mode 100644
index 1a9bbe7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_5_w.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 dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_5_w {
-    public static void run() {
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6.j
deleted file mode 100644
index 960f6a4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_6.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-    
-    fconst_1
-    lstore 0
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6.java
deleted file mode 100644
index 2417318..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_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 dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_6 {
-
-    public static void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6_w.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6_w.j
deleted file mode 100644
index 4f32a72..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6_w.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_6_w.java
-.class public dxc/junit/opcodes/lstore/jm/T_lstore_6_w
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-     fconst_1
-    lstore_w 0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6_w.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6_w.java
deleted file mode 100644
index 69a7469..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore/jm/T_lstore_6_w.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lstore.jm;
-
-public class T_lstore_6_w {
-    
-    public static void run() {
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/Test_lstore_0.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/Test_lstore_0.java
deleted file mode 100644
index 9259090..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/Test_lstore_0.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lstore_0;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lstore_0.jm.T_lstore_0_1;
-import dxc.junit.opcodes.lstore_0.jm.T_lstore_0_2;
-
-public class Test_lstore_0 extends DxTestCase {
-
-    /**
-     * @title value of local variable at <n> is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(1234567890123l, T_lstore_0_1.run());
-    }
-
-    /**
-     * @title Each of the lstore_<n> instructions is the same as lstore with an index of <n>
-     */
-    public void testN2() {
-        assertTrue(T_lstore_0_2.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_0.jm.T_lstore_0_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_0.jm.T_lstore_0_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_0.jm.T_lstore_0_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_0.jm.T_lstore_0_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_1.j
deleted file mode 100644
index e6d36c0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_1.j
+++ /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_lstore_0_1.java
-.class public dxc/junit/opcodes/lstore_0/jm/T_lstore_0_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 2
-    
-    ldc2_w 1234567890123
-    lstore_0
-    ldc2_w 4
-    lload_0
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_1.java
deleted file mode 100644
index 3d017ea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_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 dxc.junit.opcodes.lstore_0.jm;
-
-public class T_lstore_0_1 {
-
-    public static long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_2.j
deleted file mode 100644
index f61972a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_2.j
+++ /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_lstore_0_2.java
-.class public dxc/junit/opcodes/lstore_0/jm/T_lstore_0_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 2
-   
-    ldc2_w 1234567890123
-    lstore_0
-    lload_0
-    
-    ldc2_w 1234567890123
-    lstore 0
-    lload_0
-    
-    lcmp
-    ifne Label0
-    iconst_1
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_2.java
deleted file mode 100644
index 15fff7e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_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 dxc.junit.opcodes.lstore_0.jm;
-
-public class T_lstore_0_2 {
-
-    public static boolean run() {
-        long i = 1234567890123l;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_3.j
deleted file mode 100644
index 115c9d7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_0_3.java
-.class public dxc/junit/opcodes/lstore_0/jm/T_lstore_0_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    lstore_0
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_3.java
deleted file mode 100644
index 78bedb4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_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 dxc.junit.opcodes.lstore_0.jm;
-
-public class T_lstore_0_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_4.j
deleted file mode 100644
index 212743c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_0_4.java
-.class public dxc/junit/opcodes/lstore_0/jm/T_lstore_0_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    lstore_0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_4.java
deleted file mode 100644
index 84982cb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_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 dxc.junit.opcodes.lstore_0.jm;
-
-public class T_lstore_0_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_5.j
deleted file mode 100644
index e8653c7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_0_5.java
-.class public dxc/junit/opcodes/lstore_0/jm/T_lstore_0_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    iconst_1
-    lstore_0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_5.java
deleted file mode 100644
index 82e115b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_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 dxc.junit.opcodes.lstore_0.jm;
-
-public class T_lstore_0_5 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_6.j
deleted file mode 100644
index 6722bca..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_6.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_0_6.java
-.class public dxc/junit/opcodes/lstore_0/jm/T_lstore_0_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    lstore_0
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_6.java
deleted file mode 100644
index 7a56680..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_0/jm/T_lstore_0_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 dxc.junit.opcodes.lstore_0.jm;
-
-public class T_lstore_0_6 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/Test_lstore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/Test_lstore_1.java
deleted file mode 100644
index 019721b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/Test_lstore_1.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lstore_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lstore_1.jm.T_lstore_1_1;
-import dxc.junit.opcodes.lstore_1.jm.T_lstore_1_2;
-
-public class Test_lstore_1 extends DxTestCase {
-
-    /**
-     * @title value of local variable at <n> is pushed onto the operand stack
-     */
-    public void testN1() {
-        assertEquals(1234567890123l, T_lstore_1_1.run());
-    }
-
-    /**
-     * @title each of the lstore_<n> instructions is the same as lstore with an index of <n>
-     */
-    public void testN2() {
-        assertTrue(T_lstore_1_2.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_1.jm.T_lstore_1_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_1.jm.T_lstore_1_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_1.jm.T_lstore_1_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_1.jm.T_lstore_1_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_1.j
deleted file mode 100644
index 6da940c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_1.j
+++ /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_lstore_1_1.java
-.class public dxc/junit/opcodes/lstore_1/jm/T_lstore_1_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 4
-    
-    ldc2_w 1234567890123
-    lstore_1
-    ldc2_w 4
-    lload_1
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_1.java
deleted file mode 100644
index 406368d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_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 dxc.junit.opcodes.lstore_1.jm;
-
-public class T_lstore_1_1 {
-    
-    public static long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_2.j
deleted file mode 100644
index cdbae78..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_2.j
+++ /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_lstore_1_2.java
-.class public dxc/junit/opcodes/lstore_1/jm/T_lstore_1_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 4
-    
-    ldc2_w 1234567890123
-    lstore_1
-    lload_1
-
-    ldc2_w 1234567890123
-    lstore 1
-    lload_1
-    
-    lcmp
-    ifne Label0
-    iconst_1
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_2.java
deleted file mode 100644
index 767fccb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_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 dxc.junit.opcodes.lstore_1.jm;
-
-public class T_lstore_1_2 {
-
-    public static boolean run() {
-        long i = 1234567890123l;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_3.j
deleted file mode 100644
index 46567eb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_1_3.java
-.class public dxc/junit/opcodes/lstore_1/jm/T_lstore_1_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    lstore_1
-    return
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_3.java
deleted file mode 100644
index 2a02047..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_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 dxc.junit.opcodes.lstore_1.jm;
-
-public class T_lstore_1_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_4.j
deleted file mode 100644
index 8045824..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_1_4.java
-.class public dxc/junit/opcodes/lstore_1/jm/T_lstore_1_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    lstore_1
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_4.java
deleted file mode 100644
index b27f43f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_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 dxc.junit.opcodes.lstore_1.jm;
-
-public class T_lstore_1_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_5.j
deleted file mode 100644
index 4926c01..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_1_5.java
-.class public dxc/junit/opcodes/lstore_1/jm/T_lstore_1_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    iconst_1
-    lstore_1
-    return
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_5.java
deleted file mode 100644
index 380b2e6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_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 dxc.junit.opcodes.lstore_1.jm;
-
-public class T_lstore_1_5 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_6.j
deleted file mode 100644
index 684aa83..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_6.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_1_6.java
-.class public dxc/junit/opcodes/lstore_1/jm/T_lstore_1_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_1
-    lstore_1
-    return
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_6.java
deleted file mode 100644
index 22b4ec4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_1/jm/T_lstore_1_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 dxc.junit.opcodes.lstore_1.jm;
-
-public class T_lstore_1_6 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/Test_lstore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/Test_lstore_2.java
deleted file mode 100644
index e42d3f8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/Test_lstore_2.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lstore_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lstore_2.jm.T_lstore_2_1;
-import dxc.junit.opcodes.lstore_2.jm.T_lstore_2_2;
-
-public class Test_lstore_2 extends DxTestCase {
-
-    /**
-     * @title value of local variable at <n> is pushed onto the operand stack.
-     */
-    public void testN1() {
-        assertEquals(1234567890123l, T_lstore_2_1.run());
-    }
-
-    /**
-     * @title each of the lstore_<n> instructions is the same as lstore with an index of <n>
-     */
-    public void testN2() {
-        assertTrue(T_lstore_2_2.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_2.jm.T_lstore_2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_2.jm.T_lstore_2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_2.jm.T_lstore_2_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_2.jm.T_lstore_2_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_1.j
deleted file mode 100644
index 28b3391..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_1.j
+++ /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_lstore_2_1.java
-.class public dxc/junit/opcodes/lstore_2/jm/T_lstore_2_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 4
-    
-    ldc2_w 1234567890123
-    lstore_2
-    ldc2_w 4
-    lload_2
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_1.java
deleted file mode 100644
index cf0a9c6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_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 dxc.junit.opcodes.lstore_2.jm;
-
-public class T_lstore_2_1 {
-
-    public static long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_2.j
deleted file mode 100644
index 7bd36ac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_2.j
+++ /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_lstore_2_2.java
-.class public dxc/junit/opcodes/lstore_2/jm/T_lstore_2_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 4
-    
-    ldc2_w 1234567890123
-    lstore_2
-    lload_2
-
-    ldc2_w 1234567890123
-    lstore 2
-    lload_2
-    
-    lcmp
-    ifne Label0
-    iconst_1
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_2.java
deleted file mode 100644
index 8947807..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_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 dxc.junit.opcodes.lstore_2.jm;
-
-public class T_lstore_2_2 {
-
-    public static boolean run() {
-        long i = 1234567890123l;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_3.j
deleted file mode 100644
index fbd7f42..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_2_3.java
-.class public dxc/junit/opcodes/lstore_2/jm/T_lstore_2_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    lstore_2
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_3.java
deleted file mode 100644
index ff83d99..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_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 dxc.junit.opcodes.lstore_2.jm;
-
-public class T_lstore_2_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_4.j
deleted file mode 100644
index d939607..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_2_4.java
-.class public dxc/junit/opcodes/lstore_2/jm/T_lstore_2_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    dconst_1
-    lstore_2
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_4.java
deleted file mode 100644
index c9b028e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_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 dxc.junit.opcodes.lstore_2.jm;
-
-public class T_lstore_2_4 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_5.j
deleted file mode 100644
index 51d5d5f3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_2_5.java
-.class public dxc/junit/opcodes/lstore_2/jm/T_lstore_2_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    iconst_2
-    lstore_2
-    return
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_5.java
deleted file mode 100644
index 898c226..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_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 dxc.junit.opcodes.lstore_2.jm;
-
-public class T_lstore_2_5 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_6.j
deleted file mode 100644
index 9de277f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_6.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_2_6.java
-.class public dxc/junit/opcodes/lstore_2/jm/T_lstore_2_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 4
-
-    fconst_2
-    lstore_2
-    return
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_6.java
deleted file mode 100644
index 30c6c25..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_2/jm/T_lstore_2_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 dxc.junit.opcodes.lstore_2.jm;
-
-public class T_lstore_2_6 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/Test_lstore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/Test_lstore_3.java
deleted file mode 100644
index b89ca5c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/Test_lstore_3.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lstore_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lstore_3.jm.T_lstore_3_1;
-import dxc.junit.opcodes.lstore_3.jm.T_lstore_3_2;
-
-public class Test_lstore_3 extends DxTestCase {
-
-    /**
-     * @title value of local variable at <n> is pushed onto the operand stack.
-     */
-    public void testN1() {
-        assertEquals(1234567890123l, T_lstore_3_1.run());
-    }
-
-    /**
-     * @title each of the lstore_<n> instructions is the same as lstore with an index of <n>
-     */
-    public void testN2() {
-        assertTrue(T_lstore_3_2.run());
-    }
-
-    /**
-     * @constraint 4.8.1.22
-     * @title index must be no greater than the value
-     * of max_locals-1
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_3.jm.T_lstore_3_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_3.jm.T_lstore_3_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_3.jm.T_lstore_3_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of argument - float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lstore_3.jm.T_lstore_3_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_1.j
deleted file mode 100644
index d5cafea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_1.j
+++ /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_lstore_3_1.java
-.class public dxc/junit/opcodes/lstore_3/jm/T_lstore_3_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()J
-    .limit stack 4
-    .limit locals 5
-    
-    ldc2_w 1234567890123
-    lstore_3
-    ldc2_w 4
-    lload_3
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_1.java
deleted file mode 100644
index a03805a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_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 dxc.junit.opcodes.lstore_3.jm;
-
-public class T_lstore_3_1 {
-
-    public static long run() {
-        return 1234567890123l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_2.j
deleted file mode 100644
index bd47d6e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_2.j
+++ /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_lstore_3_2.java
-.class public dxc/junit/opcodes/lstore_3/jm/T_lstore_3_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()Z
-    .limit stack 4
-    .limit locals 5
-    
-    ldc2_w 1234567890123
-    lstore_3
-    lload_3
-
-    ldc2_w 1234567890123
-    lstore 3
-    lload_3
-    
-    lcmp
-    ifne Label0
-    iconst_3
-    ireturn
-
-Label0:
-    iconst_0
-    ireturn
-   
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_2.java
deleted file mode 100644
index cbe2c13..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_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 dxc.junit.opcodes.lstore_3.jm;
-
-public class T_lstore_3_2 {
-
-    public static boolean run() {
-        long i = 1234567890123l;
-        return i == i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_3.j
deleted file mode 100644
index 6ddc10b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_3.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_3_3.java
-.class public dxc/junit/opcodes/lstore_3/jm/T_lstore_3_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 0
-
-    lstore_3
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_3.java
deleted file mode 100644
index 89e037a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_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 dxc.junit.opcodes.lstore_3.jm;
-
-public class T_lstore_3_3 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_4.j
deleted file mode 100644
index f8266ef..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_3_4.java
-.class public dxc/junit/opcodes/lstore_3/jm/T_lstore_3_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    dconst_1
-    lstore_3
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_4.java
deleted file mode 100644
index 493601a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_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 dxc.junit.opcodes.lstore_3.jm;
-
-public class T_lstore_3_4 {
-    
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_5.j
deleted file mode 100644
index 4dd787e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_3_5.java
-.class public dxc/junit/opcodes/lstore_3/jm/T_lstore_3_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    iconst_3
-    lstore_3
-    return
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_5.java
deleted file mode 100644
index 70f5f71..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_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 dxc.junit.opcodes.lstore_3.jm;
-
-public class T_lstore_3_5 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_6.j
deleted file mode 100644
index 3684396..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_6.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lstore_3_6.java
-.class public dxc/junit/opcodes/lstore_3/jm/T_lstore_3_6
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public static run()V
-    .limit stack 4
-    .limit locals 5
-
-    fconst_1
-    lstore_3
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_6.java
deleted file mode 100644
index 766386b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lstore_3/jm/T_lstore_3_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 dxc.junit.opcodes.lstore_3.jm;
-
-public class T_lstore_3_6 {
-
-    public static void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/Test_lsub.java b/tools/dx-tests/src/dxc/junit/opcodes/lsub/Test_lsub.java
deleted file mode 100644
index e298784..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/Test_lsub.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 dxc.junit.opcodes.lsub;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lsub.jm.T_lsub_1;
-
-public class Test_lsub extends DxTestCase {
-
-    /**
-     * @title Arguments = 1111127348242l, 11111111114l
-     */
-    public void testN1() {
-        T_lsub_1 t = new T_lsub_1();
-        assertEquals(1100016237128l, t.run(1111127348242l, 11111111114l));
-    }
-
-    /**
-     * @title Arguments = 0, 1111127348242l
-     */
-    public void testN2() {
-        T_lsub_1 t = new T_lsub_1();
-        assertEquals(-1111127348242l, t.run(0, 1111127348242l));
-    }
-
-    /**
-     * @title Arguments = 0, -11111111114l
-     */
-    public void testN3() {
-        T_lsub_1 t = new T_lsub_1();
-        assertEquals(11111111114l, t.run(0, -11111111114l));
-    }
-
-    /**
-     * @title Arguments = 0l, Long.MAX_VALUE
-     */
-    public void testB1() {
-        T_lsub_1 t = new T_lsub_1();
-        assertEquals(-9223372036854775807L, t.run(0l, Long.MAX_VALUE));
-    }
-    /**
-     * @title Arguments = 9223372036854775807L, Long.MAX_VALUE
-     */
-    public void testB2() {
-        T_lsub_1 t = new T_lsub_1();
-        assertEquals(0l, t.run(9223372036854775807L, Long.MAX_VALUE));
-    }
-    /**
-     * @title Arguments = Long.MAX_VALUE, -1l
-     */
-    public void testB3() {
-        T_lsub_1 t = new T_lsub_1();
-        assertEquals(-9223372036854775808L, t.run(Long.MAX_VALUE, -1l));
-    }
-    /**
-     * @title Arguments = Long.MIN_VALUE, 1l
-     */
-    public void testB4() {
-        T_lsub_1 t = new T_lsub_1();
-        assertEquals(9223372036854775807L, t.run(Long.MIN_VALUE, 1l));
-    }
-    /**
-     * @title Arguments = 0l, 0l
-     */
-    public void testB5() {
-        T_lsub_1 t = new T_lsub_1();
-        assertEquals(0l, t.run(0l, 0l));
-    }
-    /**
-     * @title Arguments = 0l, -Long.MIN_VALUE
-     */
-    public void testB6() {
-        T_lsub_1 t = new T_lsub_1();
-        assertEquals(-9223372036854775808L, t.run(0l, -Long.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lsub.jm.T_lsub_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lsub.jm.T_lsub_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lsub.jm.T_lsub_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, float
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lsub.jm.T_lsub_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long, reference
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lsub.jm.T_lsub_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_1.j
deleted file mode 100644
index 1afeb41..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_1.j
+++ /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_lsub_1.java
-.class public dxc/junit/opcodes/lsub/jm/T_lsub_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    lload_3
-    lsub
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_1.java
deleted file mode 100644
index 047b1bf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_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 dxc.junit.opcodes.lsub.jm;
-
-public class T_lsub_1 {
-    
-    public long run(long a, long b) {
-        return a-b;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_2.j
deleted file mode 100644
index 8872c53..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_2.j
+++ /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_lsub_2.java
-.class public dxc/junit/opcodes/lsub/jm/T_lsub_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-;    lload_1
-    lload_3
-    lsub
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_2.java
deleted file mode 100644
index c509295..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_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 dxc.junit.opcodes.lsub.jm;
-
-public class T_lsub_2 {
-
-    public long run(long a, long b) {
-        return a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_3.j
deleted file mode 100644
index f1fa846..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_3.j
+++ /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_lsub_3.java
-.class public dxc/junit/opcodes/lsub/jm/T_lsub_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JD)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    dload_3
-    lsub
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_3.java
deleted file mode 100644
index d86e773..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_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 dxc.junit.opcodes.lsub.jm;
-
-public class T_lsub_3 {
-
-    public long run(long a, double b) {
-        return (long)(a-b);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_4.j
deleted file mode 100644
index 1443e48..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_4.j
+++ /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_lsub_4.java
-.class public dxc/junit/opcodes/lsub/jm/T_lsub_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(IJ)J
-    .limit stack 4
-    .limit locals 4
-
-    iload_1
-    lload_2
-    lsub
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_4.java
deleted file mode 100644
index e3166d0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_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 dxc.junit.opcodes.lsub.jm;
-
-public class T_lsub_4 {
-
-    public long run(int a, long b) {
-        return a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_5.j
deleted file mode 100644
index 8156f63..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_5.j
+++ /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_lsub_5.java
-.class public dxc/junit/opcodes/lsub/jm/T_lsub_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FJ)J
-    .limit stack 3
-    .limit locals 4
-
-    fload_1
-    lload_2
-    lsub
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_5.java
deleted file mode 100644
index 3e89d5c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_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 dxc.junit.opcodes.lsub.jm;
-
-public class T_lsub_5 {
-
-    public long run(float a, long b) {
-        return (long)(a-b);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_6.j
deleted file mode 100644
index 0598c05..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lsub_6.java
-.class public dxc/junit/opcodes/lsub/jm/T_lsub_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    aload_0
-    lsub
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_6.java
deleted file mode 100644
index d0fd41b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lsub/jm/T_lsub_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 dxc.junit.opcodes.lsub.jm;
-
-public class T_lsub_6 {
-
-    public long run(long a, long b) {
-        return a-b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/Test_lushr.java b/tools/dx-tests/src/dxc/junit/opcodes/lushr/Test_lushr.java
deleted file mode 100644
index 41f41ea..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/Test_lushr.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lushr;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lushr.jm.T_lushr_1;
-
-public class Test_lushr extends DxTestCase {
-
-    /**
-     * @title Arguments = 40000000000l, 3
-     */
-    public void testN1() {
-        T_lushr_1 t = new T_lushr_1();
-        assertEquals(5000000000l, t.run(40000000000l, 3));
-    }
-
-    /**
-     * @title Arguments = 40000000000l, 1
-     */
-    public void testN2() {
-        T_lushr_1 t = new T_lushr_1();
-        assertEquals(20000000000l, t.run(40000000000l, 1));
-    }
-
-    /**
-     * @title Arguments = -123456789l, 1
-     */
-    public void testN3() {
-        T_lushr_1 t = new T_lushr_1();
-        assertEquals(0x7FFFFFFFFC521975l, t.run(-123456789l, 1));
-    }
-
-    /**
-     * @title  Arguments = 1, -1
-     */
-    public void testN4() {
-        T_lushr_1 t = new T_lushr_1();
-        assertEquals(0l, t.run(1l, -1));
-    }
-
-    /**
-     * @title Arguments = 123456789l, 64
-     */
-    public void testN5() {
-        T_lushr_1 t = new T_lushr_1();
-        assertEquals(123456789l, t.run(123456789l, 64));
-    }
-
-    /**
-     * @title Arguments = 123456789l, 63
-     */
-    public void testN6() {
-        T_lushr_1 t = new T_lushr_1();
-        assertEquals(0l, t.run(123456789l, 63));
-    }
-
-    /**
-     * @title  Arguments = 0, -1
-     */
-    public void testB1() {
-        T_lushr_1 t = new T_lushr_1();
-        assertEquals(0l, t.run(0l, -1));
-    }
-
-    /**
-     * @title  Arguments = Long.MAX_VALUE, 1
-     */
-    public void testB2() {
-        T_lushr_1 t = new T_lushr_1();
-        assertEquals(0x3FFFFFFFFFFFFFFFl, t.run(Long.MAX_VALUE, 1));
-    }
-
-    /**
-     * @title  Arguments = Long.MIN_VALUE, 1
-     */
-    public void testB3() {
-        T_lushr_1 t = new T_lushr_1();
-        assertEquals(0x4000000000000000l, t.run(Long.MIN_VALUE, 1));
-    }
-
-    /**
-     * @title  Arguments = 1, 0
-     */
-    public void testB4() {
-        T_lushr_1 t = new T_lushr_1();
-        assertEquals(1l, t.run(1l, 0));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lushr.jm.T_lushr_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double, int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lushr.jm.T_lushr_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int, int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lushr.jm.T_lushr_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float, int
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lushr.jm.T_lushr_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference, int
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lushr.jm.T_lushr_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_1.j
deleted file mode 100644
index 4c92f16..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_1.j
+++ /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_lushr_1.java
-.class public dxc/junit/opcodes/lushr/jm/T_lushr_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JI)J
-    .limit stack 3
-    .limit locals 4
-
-    lload_1
-    iload_3
-    lushr
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_1.java
deleted file mode 100644
index eebd399..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_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 dxc.junit.opcodes.lushr.jm;
-
-public class T_lushr_1 {
-
-    public long run(long a, int b) {
-        return a >>> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_2.j
deleted file mode 100644
index fde0760..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_2.j
+++ /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_lushr_2.java
-.class public dxc/junit/opcodes/lushr/jm/T_lushr_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JI)J
-    .limit stack 3
-    .limit locals 4
-
-;    lload_1
-    iload_3
-    lushr
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_2.java
deleted file mode 100644
index 2512ad1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_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 dxc.junit.opcodes.lushr.jm;
-
-public class T_lushr_2 {
-
-    public long run(long a, int b) {
-        return a >>> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_3.j
deleted file mode 100644
index baeb03f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_3.j
+++ /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_lushr_3.java
-.class public dxc/junit/opcodes/lushr/jm/T_lushr_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DI)J
-    .limit stack 3
-    .limit locals 4
-
-    dload_1
-    iload_3
-    lushr
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_3.java
deleted file mode 100644
index a349f21..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_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 dxc.junit.opcodes.lushr.jm;
-
-public class T_lushr_3 {
-
-    public long run(double a, int b) {
-        return (long)a >>> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_4.j
deleted file mode 100644
index 0713473..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_4.j
+++ /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_lushr_4.java
-.class public dxc/junit/opcodes/lushr/jm/T_lushr_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)J
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    iload_2
-    lushr
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_4.java
deleted file mode 100644
index f2c2dbd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_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 dxc.junit.opcodes.lushr.jm;
-
-public class T_lushr_4 {
-
-    public long run(int a, int b) {
-        return a >>> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_5.j
deleted file mode 100644
index 2d9f06e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_5.j
+++ /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_lushr_5.java
-.class public dxc/junit/opcodes/lushr/jm/T_lushr_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FI)J
-    .limit stack 3
-    .limit locals 3
-
-    fload_1
-    iload_2
-    lushr
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_5.java
deleted file mode 100644
index 0ac3afd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_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 dxc.junit.opcodes.lushr.jm;
-
-public class T_lushr_5 {
-
-    public long run(float a, int b) {
-        return (long)a >>> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_6.j
deleted file mode 100644
index 6c5158f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lushr_6.java
-.class public dxc/junit/opcodes/lushr/jm/T_lushr_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JI)J
-    .limit stack 3
-    .limit locals 4
-
-    aload_0
-    iload_3
-    lushr
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_6.java
deleted file mode 100644
index cc32717..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lushr/jm/T_lushr_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 dxc.junit.opcodes.lushr.jm;
-
-public class T_lushr_6 {
-
-    public long run(long a, int b) {
-        return a >>> b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/Test_lxor.java b/tools/dx-tests/src/dxc/junit/opcodes/lxor/Test_lxor.java
deleted file mode 100644
index 567c548..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/Test_lxor.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.lxor;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.lxor.jm.T_lxor_1;
-
-public class Test_lxor extends DxTestCase {
-
-    /**
-     * @title Arguments = 23423432423777l, 23423432423778l
-     */
-    public void testN1() {
-        T_lxor_1 t = new T_lxor_1();
-        assertEquals(3, t.run(23423432423777l, 23423432423778l));
-    }
-
-    /**
-     * @title Arguments = 0xfffffff5, 0xfffffff1
-     */
-    public void testN2() {
-        T_lxor_1 t = new T_lxor_1();
-        assertEquals(4, t.run(0xfffffff5, 0xfffffff1));
-    }
-
-    /**
-     * @title  Arguments = 0xABCDEFAB & -1
-     */
-    public void testN3() {
-        T_lxor_1 t = new T_lxor_1();
-        assertEquals(0x54321054, t.run(0xABCDEFAB, -1l));
-    }
-
-    /**
-     * @title  Arguments = 0 & -1
-     */
-    public void testB1() {
-        T_lxor_1 t = new T_lxor_1();
-        assertEquals(-1l, t.run(0l, -1l));
-    }
-
-    /**
-     * @title  Arguments = Long.MAX_VALUE & Long.MIN_VALUE
-     */
-    public void testB2() {
-        T_lxor_1 t = new T_lxor_1();
-        assertEquals(0xffffffff, t.run(Long.MAX_VALUE, Long.MIN_VALUE));
-    }
-
-    /**
-     * @title  Arguments = Long.MAX_VALUE & Long.MAX_VALUE
-     */
-    public void testB3() {
-        T_lxor_1 t = new T_lxor_1();
-        assertEquals(0l, t.run(Long.MAX_VALUE, Long.MAX_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.lxor.jm.T_lxor_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & long
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.lxor.jm.T_lxor_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int & long
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.lxor.jm.T_lxor_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - float & long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.lxor.jm.T_lxor_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - reference & long
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.lxor.jm.T_lxor_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_1.j b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_1.j
deleted file mode 100644
index a6d08d1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_1.j
+++ /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_lxor_1.java
-.class public dxc/junit/opcodes/lxor/jm/T_lxor_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-    
-    lload_1
-    lload_3
-    lxor
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_1.java b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_1.java
deleted file mode 100644
index e7e1c94..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_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 dxc.junit.opcodes.lxor.jm;
-
-public class T_lxor_1 {
-
-    public long run(long a, long b) {
-        return a ^ b; 
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_2.j b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_2.j
deleted file mode 100644
index 4510c47..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_2.j
+++ /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_lxor_2.java
-.class public dxc/junit/opcodes/lxor/jm/T_lxor_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-;    lload_3
-    lxor
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_2.java b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_2.java
deleted file mode 100644
index 2216760..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_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 dxc.junit.opcodes.lxor.jm;
-
-public class T_lxor_2 {
-
-    public long run(long a, long b) {
-        return a ^ b; 
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_3.j b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_3.j
deleted file mode 100644
index b0ff453..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_3.j
+++ /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_lxor_3.java
-.class public dxc/junit/opcodes/lxor/jm/T_lxor_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(DJ)J
-    .limit stack 4
-    .limit locals 5
-
-    dload_1
-    lload_3
-    lxor
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_3.java b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_3.java
deleted file mode 100644
index 7dc6d0a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_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 dxc.junit.opcodes.lxor.jm;
-
-public class T_lxor_3 {
-
-    public long run(double a, long b) {
-        return (long)a ^ b; 
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_4.j b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_4.j
deleted file mode 100644
index 2c39d88..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_4.j
+++ /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_lxor_4.java
-.class public dxc/junit/opcodes/lxor/jm/T_lxor_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(IJ)J
-    .limit stack 4
-    .limit locals 4
-
-    iload_1
-    lload_2
-    lxor
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_4.java b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_4.java
deleted file mode 100644
index aeb756e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_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 dxc.junit.opcodes.lxor.jm;
-
-public class T_lxor_4 {
-
-    public long run(int a, long b) {
-        return a ^ b; 
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_5.j b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_5.j
deleted file mode 100644
index 72d4a35..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_5.j
+++ /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_lxor_5.java
-.class public dxc/junit/opcodes/lxor/jm/T_lxor_5
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(FJ)J
-    .limit stack 4
-    .limit locals 4
-
-    fload_1
-    lload_2
-    lxor
-
-    lreturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_5.java b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_5.java
deleted file mode 100644
index 3310cb1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_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 dxc.junit.opcodes.lxor.jm;
-
-public class T_lxor_5 {
-
-    public long run(float a, long b) {
-        return (long)a ^ b; 
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_6.j b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_6.j
deleted file mode 100644
index aaa389b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_lxor_6.java
-.class public dxc/junit/opcodes/lxor/jm/T_lxor_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(JJ)J
-    .limit stack 4
-    .limit locals 5
-
-    aload_0
-    lload_3
-    lxor
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_6.java b/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_6.java
deleted file mode 100644
index 390a570..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/lxor/jm/T_lxor_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 dxc.junit.opcodes.lxor.jm;
-
-public class T_lxor_6 {
-
-    public long run(long a, long b) {
-        return a ^ b; 
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/Test_monitorenter.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/Test_monitorenter.java
deleted file mode 100644
index a47cc26..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/Test_monitorenter.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 dxc.junit.opcodes.monitorenter;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.monitorenter.jm.T_monitorenter_1;
-import dxc.junit.opcodes.monitorenter.jm.T_monitorenter_2;
-import dxc.junit.opcodes.monitorenter.jm.T_monitorenter_4;
-
-public class Test_monitorenter extends DxTestCase {
-
-    /**
-     * @title normal test
-     * 
-     * @throws InterruptedException
-     */
-    public void testN1() throws InterruptedException {
-        //@uses dxc.junit.opcodes.monitorenter.TestRunnable
-        final T_monitorenter_1 t1 = new T_monitorenter_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 dxc.junit.opcodes.monitorenter.TestRunnable2
-        final T_monitorenter_2 t1 = new T_monitorenter_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_monitorenter_4 t = new T_monitorenter_4();
-        try {
-            t.run();
-            fail("expected NullPointerException");
-        } catch (NullPointerException npe) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.monitorenter.jm.T_monitorenter_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.monitorenter.jm.T_monitorenter_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
-
-class TestRunnable implements Runnable {
-    private T_monitorenter_1 t1;
-    TestRunnable(T_monitorenter_1 t1) {
-        this.t1 = t1;
-    }
-    
-    public void run() {
-        try {
-            t1.run();
-        } catch (InterruptedException e) {
-            throw new RuntimeException("interrupted!");
-        }
-    }
-}
-
-class TestRunnable2 implements Runnable {
-    private T_monitorenter_2 t2;
-    private int val;
-    TestRunnable2(T_monitorenter_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/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_1.j b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_1.j
deleted file mode 100644
index 0ea107d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_1.j
+++ /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.
-
-.source T_monitorenter_1.java
-.class public dxc/junit/opcodes/monitorenter/jm/T_monitorenter_1
-.super java/lang/Object
-
-.field public counter I
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_1.counter I
-
-    return
-.end method
-
-
-.method public run()V
-    .throws java/lang/InterruptedException
-    .limit stack 3
-    .limit locals 3
-    
-Label1:
-    aload_0
-    dup
-    astore_1
-    monitorenter
-
-Label5:
-    aload_0
-    getfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_1.counter I
-    istore_2
-
-Label3:
-    ldc2_w 500
-    invokestatic java/lang/Thread/sleep(J)V
-
-    aload_0
-    iinc 2 1
-    iload_2
-    putfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_1.counter I
-
-Label4:
-    aload_1
-    monitorexit
-
-Label6:
-    goto Label0
-
-Label7:
-    aload_1
-    monitorexit
-
-Label9:
-    aload_0
-    iconst_m1
-    putfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_1.counter I
-    athrow
-
-Label0:
-    return
-
-.catch all from Label5 to Label6 using Label7
-.catch all from Label7 to Label9 using Label7
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_1.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_1.java
deleted file mode 100644
index 5632c81..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_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 dxc.junit.opcodes.monitorenter.jm;
-
-public class T_monitorenter_1 {
-    public int counter = 0;
-    
-    public void run() throws InterruptedException  {
-        synchronized(this) {
-            int a = counter;
-            Thread.sleep(500);
-            counter = ++a;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_2.j b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_2.j
deleted file mode 100644
index 5927fed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_2.j
+++ /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.
-
-.source T_monitorenter_2.java
-.class public dxc/junit/opcodes/monitorenter/jm/T_monitorenter_2
-.super java/lang/Object
-
-.field private flg I
-.field public result Z
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_2.flg I
-
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_2.result Z
-
-    return
-.end method
-
-
-
-.method public run(I)V
-    .throws java/lang/InterruptedException
-    .limit stack 3
-    .limit locals 4
-
-    aload_0
-    dup
-    astore_2
-    monitorenter
-
-Label13:
-    aload_0
-    dup
-    astore_3
-    monitorenter
-
-Label7:
-    aload_0
-    iload_1
-    putfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_2.flg I
-
-    aload_3
-    monitorexit
-
-Label8:
-    goto Label0
-
-Label9:
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_2.result Z
-
-    aload_3
-    monitorexit
-
-Label11:
-    athrow
-
-Label0:
-    ldc2_w 500
-    invokestatic java/lang/Thread/sleep(J)V
-
-    aload_0
-    getfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_2.flg I
-    iload_1
-    if_icmpeq Label1
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_2.result Z
-
-Label1:
-    aload_2
-    monitorexit
-
-Label14:
-    goto Label2
-
-Label15:
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.monitorenter.jm.T_monitorenter_2.result Z
-
-    aload_2
-    monitorexit
-
-Label17:
-    athrow
-
-Label2:
-    return
-
-.catch all from Label7 to Label8 using Label9
-.catch all from Label9 to Label11 using Label9
-.catch all from Label13 to Label14 using Label15
-.catch all from Label15 to Label17 using Label15
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_2.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_2.java
deleted file mode 100644
index ef7387d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_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 dxc.junit.opcodes.monitorenter.jm;
-
-public class T_monitorenter_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/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_4.j b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_4.j
deleted file mode 100644
index 8c08eeb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitorenter_5.java
-.class public dxc/junit/opcodes/monitorenter/jm/T_monitorenter_5
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 2
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .throws java/lang/InterruptedException
-    .limit stack 2
-    .limit locals 3
-
-    aconst_null
-    monitorenter
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_4.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_4.java
deleted file mode 100644
index 04b8e6b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_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 dxc.junit.opcodes.monitorenter.jm;
-
-public class T_monitorenter_4 {
-
-    public void run() {
-        Object o = null;
-        synchronized(o) {
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_5.j b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_5.j
deleted file mode 100644
index 4850486..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitorenter_5.java
-.class public dxc/junit/opcodes/monitorenter/jm/T_monitorenter_5
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 2
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .throws java/lang/InterruptedException
-    .limit stack 2
-    .limit locals 3
-
-;    aload_0    
-    iconst_1
-    monitorenter
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_5.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_5.java
deleted file mode 100644
index 02ac602..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_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 dxc.junit.opcodes.monitorenter.jm;
-
-public class T_monitorenter_5 {
-
-    public void run() {
-        synchronized(this) {
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_6.j b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_6.j
deleted file mode 100644
index 625ec89..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_6.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_monitorenter_6.java
-.class public dxc/junit/opcodes/monitorenter/jm/T_monitorenter_6
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 2
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .throws java/lang/InterruptedException
-    .limit stack 2
-    .limit locals 3
-
-;    aload_0    
-    monitorenter
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_6.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_6.java
deleted file mode 100644
index 303a03d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorenter/jm/T_monitorenter_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 dxc.junit.opcodes.monitorenter.jm;
-
-public class T_monitorenter_6 {
-    
-    public void run() {
-        synchronized(this) {
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/Test_monitorexit.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/Test_monitorexit.java
deleted file mode 100644
index b4924b6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/Test_monitorexit.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.monitorexit;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.monitorexit.jm.T_monitorexit_2;
-import dxc.junit.opcodes.monitorexit.jm.T_monitorexit_3;
-import dxc.junit.opcodes.monitorexit.jm.T_monitorexit_4;
-
-public class Test_monitorexit extends DxTestCase {
-
-    /**
-     * @title  thread is not monitor owner
-     */
-    public void testE1() throws InterruptedException {
-        //@uses dxc.junit.opcodes.monitorexit.TestRunnable
-        final T_monitorexit_2 t = new T_monitorexit_2();
-        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  structural lock rules violation
-     */
-    public void testE2() {
-        T_monitorexit_3 t = new T_monitorexit_3();
-        try {
-            t.run();
-            fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected NullPointerException
-     */
-    public void testE3() {
-        T_monitorexit_4 t = new T_monitorexit_4();
-        try {
-            t.run();
-            fail("expected NullPointerException");
-        } catch (NullPointerException npe) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.monitorexit.jm.T_monitorexit_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.monitorexit.jm.T_monitorexit_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
-
-
-class TestRunnable implements Runnable {
-    private T_monitorexit_2 t;
-    private Object o;
-
-    public TestRunnable(T_monitorexit_2 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/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_2.j b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_2.j
deleted file mode 100644
index a376e05..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_2.j
+++ /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_monitorexit_2.java
-.class public dxc/junit/opcodes/monitorexit/jm/T_monitorexit_2
-.super java/lang/Object
-
-.field public result Z
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.monitorexit.jm.T_monitorexit_2.result Z
-    
-    return
-.end method
-
-
-.method public run(Ljava/lang/Object;)V
-    .limit stack 2
-    .limit locals 2
-
-    aload_1
-    monitorexit
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_2.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_2.java
deleted file mode 100644
index de7086f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_2.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 dxc.junit.opcodes.monitorexit.jm;
-
-public class T_monitorexit_2 {
-
-    public boolean result = false;
-    
-    public void run(Object o) {
-        synchronized(o) {
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_3.j b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_3.j
deleted file mode 100644
index 8c4be70..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_3.j
+++ /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_monitorexit_3.java
-.class public dxc/junit/opcodes/monitorexit/jm/T_monitorexit_3
-.super java/lang/Object
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    monitorenter
-    aload_0    
-    monitorexit
-
-    aload_0    
-    monitorexit
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_3.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_3.java
deleted file mode 100644
index 99aefa4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_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 dxc.junit.opcodes.monitorexit.jm;
-
-public class T_monitorexit_3 {
-
-    public void run() {
-        synchronized(this) {
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_4.j b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_4.j
deleted file mode 100644
index 9c110b9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_4.j
+++ /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_monitorexit_4.java
-.class public dxc/junit/opcodes/monitorexit/jm/T_monitorexit_4
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    monitorenter
-    
-Label1:    
-    aconst_null
-    monitorexit
-Label2:
-    goto Label4
-
-Label3:
-    aload_0
-    monitorexit
-    athrow
-Label4:
-    return
-    
-.catch all from Label1 to Label2 using Label3    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_4.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_4.java
deleted file mode 100644
index 14bcbd9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_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 dxc.junit.opcodes.monitorexit.jm;
-
-public class T_monitorexit_4 {
-
-    public void run() {
-        synchronized(this) {
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_5.j b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_5.j
deleted file mode 100644
index d60a777..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_5.j
+++ /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_monitorexit_5.java
-.class public dxc/junit/opcodes/monitorexit/jm/T_monitorexit_5
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    monitorenter
-;    aload_0
-    monitorexit
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_5.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_5.java
deleted file mode 100644
index 5210071..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_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 dxc.junit.opcodes.monitorexit.jm;
-
-public class T_monitorexit_5 {
-
-    public void run() {
-        synchronized(this) {
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_6.j b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_6.j
deleted file mode 100644
index a56c030..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_6.j
+++ /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_monitorexit_6.java
-.class public dxc/junit/opcodes/monitorexit/jm/T_monitorexit_6
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    monitorenter
-    iconst_1
-    monitorexit
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_6.java b/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_6.java
deleted file mode 100644
index d7e9825..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/monitorexit/jm/T_monitorexit_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 dxc.junit.opcodes.monitorexit.jm;
-
-public class T_monitorexit_6 {
-
-    public void run() {
-        synchronized(this) {
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/Test_multianewarray.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/Test_multianewarray.java
deleted file mode 100644
index 0d2d0fb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/Test_multianewarray.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 dxc.junit.opcodes.multianewarray;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.multianewarray.jm.T_multianewarray_1;
-import dxc.junit.opcodes.multianewarray.jm.T_multianewarray_2;
-import dxc.junit.opcodes.multianewarray.jm.T_multianewarray_7;
-import dxc.junit.opcodes.multianewarray.jm.T_multianewarray_9;
-
-public class Test_multianewarray extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_multianewarray_1 t = new T_multianewarray_1();
-        String[][][] res = t.run(2, 5, 4);
-
-        assertEquals(2, res.length);
-
-        // check default initialization
-        for (int i = 0; i < 2; i++) {
-            assertEquals(5, res[i].length);
-
-            for (int j = 0; j < 5; j++) {
-                assertEquals(4, res[i][j].length);
-
-                for (int k = 0; j < 4; j++) {
-                    assertNull(res[i][j][k]);
-                }
-            }
-        }
-    }
-
-    /**
-     * @title  if count is zero, no subsequent dimensions allocated
-     */
-    public void testN2() {
-        T_multianewarray_1 t = new T_multianewarray_1();
-        String[][][] res = t.run(2, 0, 4);
-
-        try {
-            String s = res[2][0][0];
-            fail("expected ArrayIndexOutOfBoundsException");
-            fail("dummy for s "+s);
-        } catch (ArrayIndexOutOfBoundsException ae) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  multinewarray must only be used to create array with
-     * dimensions specified by dimensions operand
-     */
-    public void testN3() {
-        T_multianewarray_9 t = new T_multianewarray_9();
-        String[][][] res = t.run(2, 1, 4);
-
-        if (res.length != 2) fail("incorrect multiarray length");
-        if (res[0].length != 1) fail("incorrect array length");
-
-        try {
-            int i = res[0][0].length;
-            fail("expected NullPointerException");
-            fail("dummy for i "+i);
-        } catch (NullPointerException npe) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected NegativeArraySizeException
-     */
-    public void testE1() {
-        T_multianewarray_1 t = new T_multianewarray_1();
-        try {
-            t.run(2, -5, 3);
-            fail("expected NegativeArraySizeException");
-        } catch (NegativeArraySizeException nase) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected IllegalAccessError
-     */
-    public void testE2() {
-        // @uses dxc.junit.opcodes.multianewarray.jm.sub.TestStubs$TestStub
-        try {
-            T_multianewarray_2 t = new T_multianewarray_2();
-            t.run(2, 5, 3);
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NoClassDefFoundError
-     */
-    public void testE3() {
-        try {
-        T_multianewarray_7 t = new T_multianewarray_7();
-            t.run(2, 5, 3);
-            fail("expected NoClassDefFoundError");
-        } catch (NoClassDefFoundError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.16
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.multianewarray.jm.T_multianewarray_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.multianewarray.jm.T_multianewarray_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE3() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.multianewarray.jm.T_multianewarray_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.19
-     * @title dimension size must not be zero
-     */
-    public void testVFE4() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.multianewarray.jm.T_multianewarray_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.16
-     * @title constant pool type
-     */
-    public void testVFE5() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.multianewarray.jm.T_multianewarray_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE6() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.multianewarray.jm.T_multianewarray_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_1.j b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_1.j
deleted file mode 100644
index 745bb41..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_1.j
+++ /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_multianewarray_1.java
-.class public dxc/junit/opcodes/multianewarray/jm/T_multianewarray_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(III)[[[Ljava/lang/String;
-    .limit stack 3
-    .limit locals 4
-    iload_1
-    iload_2
-    iload_3
-    multianewarray [[[Ljava/lang/String; 3
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_1.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_1.java
deleted file mode 100644
index 8acf7ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_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 dxc.junit.opcodes.multianewarray.jm;
-
-public class T_multianewarray_1 {
-
-    public String[][][] run(int d1, int d2, int d3) {
-        return new String[d1][d2][d3];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_10.j b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_10.j
deleted file mode 100644
index 2fc8358..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_10.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_multianewarray_10.java
-.class public dxc/junit/opcodes/multianewarray/jm/T_multianewarray_10
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)[[Ljava/lang/String;
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-    aload_0
-    multianewarray [[Ljava/lang/String; 2
-    areturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_10.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_10.java
deleted file mode 100644
index 3ee7dc1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_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 dxc.junit.opcodes.multianewarray.jm;
-
-public class T_multianewarray_10 {
-    
-    public String[][] run(int d1, int d2) {
-        return new String[d1][d2];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_2.j b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_2.j
deleted file mode 100644
index 6fe2d3f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_multianewarray_2.java
-.class public dxc/junit/opcodes/multianewarray/jm/T_multianewarray_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(III)V
-    .limit stack 3
-    .limit locals 4
-    iload_1
-    iload_2
-    iload_3
-    multianewarray [[[Ldxc/junit/opcodes/multianewarray/jm/sub/TestStubs$TestStub; 3
-    pop
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_2.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_2.java
deleted file mode 100644
index fd248e2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_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 dxc.junit.opcodes.multianewarray.jm;
-
-public class T_multianewarray_2 {
-
-    public void run(int d1, int d2, int d3) {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3.cfh b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3.cfh
deleted file mode 100644
index 58462bd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3.cfh
+++ /dev/null
@@ -1,197 +0,0 @@
-//@class:dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0010
-// .  .  
-   00 10 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 08 
-    // parsed:, offset 15, len 57, h: 0002: utf8{"dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3"}
-    // .  .  6  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  m  u  l  t  i  a  n  e  w  a  r  r  a  y  /  j  m  /  T  _  m  u  l  t  i  a  n  e  w  a  r  r  a  y  _  3  
-       01 00 36 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6d 75 6c 74 69 61 6e 65 77 61 72 72 61 79 2f 6a 6d 2f 54 5f 6d 75 6c 74 69 61 6e 65 77 61 72 72 61 79 5f 33 
-    // parsed:, offset 72, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 91, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 104, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 113, len 3, h: 0006: type{dxc.junit.opcodes.multianewarray.jm.T_multianewarray_3}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 116, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 122, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0c 
-    // parsed:, offset 127, len 26, h: 0009: utf8{"T_multianewarray_3.java"}
-    // .  .  .  T  _  m  u  l  t  i  a  n  e  w  a  r  r  a  y  _  3  .  j  a  v  a  
-       01 00 17 54 5f 6d 75 6c 74 69 61 6e 65 77 61 72 72 61 79 5f 33 2e 6a 61 76 61 
-    // parsed:, offset 153, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 160, len 24, h: 000b: utf8{"[[[Ljava/lang/String;"}
-    // .  .  .  [  [  [  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  
-       01 00 15 5b 5b 5b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 
-    // parsed:, offset 184, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 190, len 29, h: 000d: utf8{"(III)[[[Ljava/lang/String;"}
-    // .  .  .  (  I  I  I  )  [  [  [  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  
-       01 00 1a 28 49 49 49 29 5b 5b 5b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 
-    // parsed:, offset 219, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 222, len 3, h: 000f: type{java.lang.String[][][]}
-    // .  .  .  
-       07 00 0b 
-// parsed:, offset 225, len 0, h: end constant_pool
-// parsed:, offset 225, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 227, len 2, h: this_class: type{dxc.junit.opcodes.multianewarray.jm.T_multianewarray_3}
-// .  .  
-   00 06 
-// parsed:, offset 229, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 231, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 233, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 235, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 237, len:75,desc: ()V
-// parsed:, offset 237, len 0, h:  methods[0]: 
-    // parsed:, offset 237, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 239, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 241, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 243, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 245, len 0, h:  attributes[0]: 
-        // parsed:, offset 245, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 247, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 251, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 253, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 255, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 264, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 266, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 268, len 0, h: end attributes[0] 
-// parsed:, offset 268, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 268, len:44,desc: (III)[[[Ljava/lang/String;
-// parsed:, offset 268, len 0, h:  methods[1]: 
-    // parsed:, offset 268, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 270, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 272, len 2, h: descriptor: (III)[[[Ljava/lang/String;
-    // .  .  
-       00 0d 
-    // parsed:, offset 274, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 276, len 0, h:  attributes[0]: 
-        // parsed:, offset 276, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 278, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 282, len 2, h: max_stack: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 284, len 2, h: max_locals: 0004
-        // .  .  
-           00 04 
-        // parsed:, offset 286, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 1, h: 0001: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 2, len 1, h: 0002: iload_3 // 03
-        // .  
-           1d 
-        // parsed:, offset 3, len 4, h: 0003: multianewarray type{java.lang.String[][][]}, 03
-        // .  .  .  .  
-//@mod           c5 00 0f 03 
-           c5 01 0f 03 
-        // parsed:, offset 7, len 1, h: 0007: areturn
-        // .  
-           b0 
-        // parsed:, offset 298, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 300, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 302, len 0, h: end attributes[0] 
-// parsed:, offset 302, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (III)[[[Ljava/lang/String;
-// parsed:, offset 302, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 304, len 0, h:  attributes[0]: 
-    // parsed:, offset 304, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 306, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 310, len 2, h: source: utf8{"T_multianewarray_3.java"}
-    // .  .  
-       00 09 
-// parsed:, offset 312, len 0, h: end attributes[0] 
-// parsed:, offset 312, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3.j b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3.j
deleted file mode 100644
index 7ca4a03..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3.j
+++ /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_multianewarray_3.java
-.class public dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(III)[[[Ljava/lang/String;
-    .limit stack 3
-    .limit locals 4
-    iload_1
-    iload_2
-    iload_3
-    multianewarray [[[Ljava/lang/String; 3
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_3.java
deleted file mode 100644
index 468ff6e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_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 dxc.junit.opcodes.multianewarray.jm;
-
-public class T_multianewarray_3 {
-
-    public String[][][] run(int d1, int d2, int d3) {
-        return new String[d1][d2][d3];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_4.j b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_4.j
deleted file mode 100644
index 3583a5a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_4.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_multianewarray_4.java
-.class public dxc/junit/opcodes/multianewarray/jm/T_multianewarray_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)[[Ljava/lang/String;
-    .limit stack 2
-    .limit locals 3
-    iload_1
-;    iload_2
-    multianewarray [[Ljava/lang/String; 2
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_4.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_4.java
deleted file mode 100644
index 24e7c45..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_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 dxc.junit.opcodes.multianewarray.jm;
-
-public class T_multianewarray_4 {
-
-    public String[][] run(int d1, int d2) {
-        return new String[d1][d2];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_5.j b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_5.j
deleted file mode 100644
index 825fd4a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_5.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_multianewarray_5.java
-.class public dxc/junit/opcodes/multianewarray/jm/T_multianewarray_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)[[Ljava/lang/String;
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    fconst_1
-    multianewarray [[Ljava/lang/String; 2
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_5.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_5.java
deleted file mode 100644
index c213317..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_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 dxc.junit.opcodes.multianewarray.jm;
-
-public class T_multianewarray_5 {
-
-    public String[][] run(int d1, int d2) {
-        return new String[d1][d2];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_6.j b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_6.j
deleted file mode 100644
index ef716e4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_6.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_multianewarray_6.java
-.class public dxc/junit/opcodes/multianewarray/jm/T_multianewarray_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)[[Ljava/lang/String;
-    .limit stack 2
-    .limit locals 3
-    iload_1
-    iload_2
-    multianewarray [[Ljava/lang/String; 0
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_6.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_6.java
deleted file mode 100644
index ce6033c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_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 dxc.junit.opcodes.multianewarray.jm;
-
-public class T_multianewarray_6 {
-
-    public String[][] run(int d1, int d2) {
-        return new String[d1][d2];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_7.j b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_7.j
deleted file mode 100644
index bce3003..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_7.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_multianewarray_7.java
-.class public dxc/junit/opcodes/multianewarray/jm/T_multianewarray_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(III)V
-    .limit stack 3
-    .limit locals 4
-    iload_1
-    iload_2
-    iload_3
-    ; class not found exception
-    multianewarray [[[Ldxc/junit/opcodes/multianewarray/jm/Foobar1; 3
-    pop
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_7.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_7.java
deleted file mode 100644
index 27939ad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_7.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 dxc.junit.opcodes.multianewarray.jm;
-
-public class T_multianewarray_7 {
-
-    public void run(int d1, int d2, int d3) {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8.cfh b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8.cfh
deleted file mode 100644
index 9228061..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8.cfh
+++ /dev/null
@@ -1,206 +0,0 @@
-//@class:dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0011
-// .  .  
-   00 11 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 06 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 09 
-    // parsed:, offset 67, len 7, h: 0007: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 74, len 24, h: 0008: utf8{"[[[Ljava/lang/String;"}
-    // .  .  .  [  [  [  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  
-       01 00 15 5b 5b 5b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 
-    // parsed:, offset 98, len 6, h: 0009: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 104, len 5, h: 000a: float{0x4048f5c3 / 3.14}
-    // .  @  H  .  .  
-       04 40 48 f5 c3 
-    // parsed:, offset 109, len 26, h: 000b: utf8{"T_multianewarray_8.java"}
-    // .  .  .  T  _  m  u  l  t  i  a  n  e  w  a  r  r  a  y  _  8  .  j  a  v  a  
-       01 00 17 54 5f 6d 75 6c 74 69 61 6e 65 77 61 72 72 61 79 5f 38 2e 6a 61 76 61 
-    // parsed:, offset 135, len 3, h: 000c: type{java.lang.String[][][]}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 138, len 57, h: 000d: utf8{"dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8"}
-    // .  .  6  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  m  u  l  t  i  a  n  e  w  a  r  r  a  y  /  j  m  /  T  _  m  u  l  t  i  a  n  e  w  a  r  r  a  y  _  8  
-       01 00 36 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6d 75 6c 74 69 61 6e 65 77 61 72 72 61 79 2f 6a 6d 2f 54 5f 6d 75 6c 74 69 61 6e 65 77 61 72 72 61 79 5f 38 
-    // parsed:, offset 195, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 198, len 29, h: 000f: utf8{"(III)[[[Ljava/lang/String;"}
-    // .  .  .  (  I  I  I  )  [  [  [  L  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  ;  
-       01 00 1a 28 49 49 49 29 5b 5b 5b 4c 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 3b 
-    // parsed:, offset 227, len 3, h: 0010: type{dxc.junit.opcodes.multianewarray.jm.T_multianewarray_8}
-    // .  .  .  
-       07 00 0d 
-// parsed:, offset 230, len 0, h: end constant_pool
-// parsed:, offset 230, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 232, len 2, h: this_class: type{dxc.junit.opcodes.multianewarray.jm.T_multianewarray_8}
-// .  .  
-   00 10 
-// parsed:, offset 234, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 236, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 238, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 240, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 242, len:78,desc: ()V
-// parsed:, offset 242, len 0, h:  methods[0]: 
-    // parsed:, offset 242, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 244, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 246, len 2, h: descriptor: ()V
-    // .  .  
-       00 09 
-    // parsed:, offset 248, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 250, len 0, h:  attributes[0]: 
-        // parsed:, offset 250, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 252, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 256, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 258, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 260, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 269, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 271, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 273, len 0, h: end attributes[0] 
-// parsed:, offset 273, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 273, len:47,desc: (III)[[[Ljava/lang/String;
-// parsed:, offset 273, len 0, h:  methods[1]: 
-    // parsed:, offset 273, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 275, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 277, len 2, h: descriptor: (III)[[[Ljava/lang/String;
-    // .  .  
-       00 0f 
-    // parsed:, offset 279, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 281, len 0, h:  attributes[0]: 
-        // parsed:, offset 281, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 283, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 287, len 2, h: max_stack: 0003
-        // .  .  
-           00 03 
-        // parsed:, offset 289, len 2, h: max_locals: 0004
-        // .  .  
-           00 04 
-        // parsed:, offset 291, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 2, h: 0000: ldc #4048f5c3 // 3.14
-        // .  .  
-           12 0a 
-        // parsed:, offset 2, len 1, h: 0002: pop
-        // W  
-           57 
-        // parsed:, offset 3, len 1, h: 0003: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 4, len 1, h: 0004: iload_2 // 02
-        // .  
-           1c 
-        // parsed:, offset 5, len 1, h: 0005: iload_3 // 03
-        // .  
-           1d 
-        // parsed:, offset 6, len 4, h: 0006: multianewarray type{java.lang.String[][][]}, 03
-        // .  .  .  .  
-//@mod           c5 00 0c 03 
-           c5 00 0a 03 
-        // parsed:, offset 10, len 1, h: 000a: areturn
-        // .  
-           b0 
-        // parsed:, offset 306, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 308, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 310, len 0, h: end attributes[0] 
-// parsed:, offset 310, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (III)[[[Ljava/lang/String;
-// parsed:, offset 310, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 312, len 0, h:  attributes[0]: 
-    // parsed:, offset 312, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 314, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 318, len 2, h: source: utf8{"T_multianewarray_8.java"}
-    // .  .  
-       00 0b 
-// parsed:, offset 320, len 0, h: end attributes[0] 
-// parsed:, offset 320, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8.j b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8.j
deleted file mode 100644
index 5d315c2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8.j
+++ /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_multianewarray_8.java
-.class public dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(III)[[[Ljava/lang/String;
-    .limit stack 3
-    .limit locals 4
-    
-    ldc 3.14
-    pop
-    
-    iload_1
-    iload_2
-    iload_3
-    multianewarray [[[Ljava/lang/String; 3
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_8.java
deleted file mode 100644
index 7b4aa01..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_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 dxc.junit.opcodes.multianewarray.jm;
-
-public class T_multianewarray_8 {
-
-    public String[][][] run(int d1, int d2, int d3) {
-        return new String[d1][d2][d3];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_9.j b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_9.j
deleted file mode 100644
index b814c67..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_9.j
+++ /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_multianewarray_9.java
-.class public dxc/junit/opcodes/multianewarray/jm/T_multianewarray_9
-.super java/lang/Object
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(III)[[[Ljava/lang/String;
-    .limit stack 2
-    .limit locals 4
-
-    iload_1
-    iload_2
-    multianewarray [[[Ljava/lang/String; 2
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_9.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_9.java
deleted file mode 100644
index 0df794d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/T_multianewarray_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 dxc.junit.opcodes.multianewarray.jm;
-
-public class T_multianewarray_9 {
-
-    public String[][][] run(int d1, int d2, int d3) {
-        return new String[d1][d2][];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/sub/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/sub/TestStubs.java
deleted file mode 100644
index ee091bb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/multianewarray/jm/sub/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 dxc.junit.opcodes.multianewarray.jm.sub;
-
-public class TestStubs {
-
-    @SuppressWarnings("unused")
-    private class TestStub {
-        // used by testE2
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/Test_newarray.java b/tools/dx-tests/src/dxc/junit/opcodes/newarray/Test_newarray.java
deleted file mode 100644
index 4126bba..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/Test_newarray.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.newarray;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.newarray.jm.T_newarray_1;
-import dxc.junit.opcodes.newarray.jm.T_newarray_2;
-
-public class Test_newarray extends DxTestCase {
-
-    /**
-     * @title  Array of ints
-     */
-    public void testN1() {
-        T_newarray_1 t = new T_newarray_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 floats
-     */
-    public void testN2() {
-        T_newarray_2 t = new T_newarray_2();
-        float[] r = t.run(10);
-        int l = r.length;
-        assertEquals(10, l);
-
-        // check default initialization
-        for (int i = 0; i < l; i++) {
-            assertEquals(0f, r[i]);
-        }
-    }
-
-    /**
-     * @title expected NegativeArraySizeException
-     */
-    public void testE1() {
-        T_newarray_2 t = new T_newarray_2();
-        try {
-            t.run(-1);
-            fail("expected NegativeArraySizeException");
-        } catch (NegativeArraySizeException nase) {
-            // expected
-        }
-    }
-
-    /**
-     * @title  Array size = 0
-     */
-    public void testB1() {
-        T_newarray_1 t = new T_newarray_1();
-        int[] r = t.run(0);
-        assertNotNull(r);
-        assertEquals(0, r.length);
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.newarray.jm.T_newarray_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.newarray.jm.T_newarray_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.20
-     * @title atype must take one of the following
-     * values
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.newarray.jm.T_newarray_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.newarray.jm.T_newarray_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_1.j b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_1.j
deleted file mode 100644
index afe0883..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_1.j
+++ /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 T_newarray_1.java
-.class public dxc/junit/opcodes/newarray/jm/T_newarray_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)[I
-    .limit locals 2
-    .limit stack 2
-    iload_1
-    newarray int
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_1.java b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_1.java
deleted file mode 100644
index 0d5d439..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_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 dxc.junit.opcodes.newarray.jm;
-
-public class T_newarray_1 {
-
-    public int[] run(int sz) {
-        return new int[sz];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_2.j b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_2.j
deleted file mode 100644
index a04589d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_2.j
+++ /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 T_newarray_2.java
-.class public dxc/junit/opcodes/newarray/jm/T_newarray_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)[F
-    .limit locals 2
-    .limit stack 2
-    iload_1
-    newarray float
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_2.java b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_2.java
deleted file mode 100644
index 419f2d5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_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 dxc.junit.opcodes.newarray.jm;
-
-public class T_newarray_2 {
-
-    public float[] run(int sz) {
-        return new float[sz];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_3.j b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_3.j
deleted file mode 100644
index 51c1004..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_3.j
+++ /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 T_newarray_3.java
-.class public dxc/junit/opcodes/newarray/jm/T_newarray_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)[I
-    .limit locals 2
-    .limit stack 2
-;    iload_1
-    newarray int
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_3.java b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_3.java
deleted file mode 100644
index 9de24fc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_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 dxc.junit.opcodes.newarray.jm;
-
-public class T_newarray_3 {
-
-    public int[] run(int sz) {
-        return new int[sz];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_4.j b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_4.j
deleted file mode 100644
index 9f56669..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_4.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_newarray_4.java
-.class public dxc/junit/opcodes/newarray/jm/T_newarray_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)[I
-    .limit locals 2
-    .limit stack 2
-;    iload_1
-    fconst_1
-    newarray int
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_4.java b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_4.java
deleted file mode 100644
index 1fcb3b8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_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 dxc.junit.opcodes.newarray.jm;
-
-public class T_newarray_4 {
-
-    public int[] run(int sz) {
-        return new int[sz];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_5.cfh
deleted file mode 100644
index b59839a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_5.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/opcodes/newarray/jm/T_newarray_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0d 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 45, h: 0005: utf8{"dxc/junit/opcodes/newarray/jm/T_newarray_5"}
-    // .  .  *  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  n  e  w  a  r  r  a  y  /  j  m  /  T  _  n  e  w  a  r  r  a  y  _  5  
-       01 00 2a 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6e 65 77 61 72 72 61 79 2f 6a 6d 2f 54 5f 6e 65 77 61 72 72 61 79 5f 35 
-    // parsed:, offset 101, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 107, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0c 
-    // parsed:, offset 112, len 3, h: 0008: type{dxc.junit.opcodes.newarray.jm.T_newarray_5}
-    // .  .  .  
-       07 00 05 
-    // parsed:, offset 115, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 122, len 20, h: 000a: utf8{"T_newarray_5.java"}
-    // .  .  .  T  _  n  e  w  a  r  r  a  y  _  5  .  j  a  v  a  
-       01 00 11 54 5f 6e 65 77 61 72 72 61 79 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 142, len 8, h: 000b: utf8{"(I)[I"}
-    // .  .  .  (  I  )  [  I  
-       01 00 05 28 49 29 5b 49 
-    // parsed:, offset 150, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 156, len 3, h: 000d: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 159, len 0, h: end constant_pool
-// parsed:, offset 159, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 161, len 2, h: this_class: type{dxc.junit.opcodes.newarray.jm.T_newarray_5}
-// .  .  
-   00 08 
-// parsed:, offset 163, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0d 
-// parsed:, offset 165, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 167, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 169, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 171, len:71,desc: ()V
-// parsed:, offset 171, len 0, h:  methods[0]: 
-    // parsed:, offset 171, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 173, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 175, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 177, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 179, len 0, h:  attributes[0]: 
-        // parsed:, offset 179, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 181, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 185, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 187, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 189, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 198, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 200, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 202, len 0, h: end attributes[0] 
-// parsed:, offset 202, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 202, len:40,desc: (I)[I
-// parsed:, offset 202, len 0, h:  methods[1]: 
-    // parsed:, offset 202, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 204, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 206, len 2, h: descriptor: (I)[I
-    // .  .  
-       00 0b 
-    // parsed:, offset 208, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 210, len 0, h:  attributes[0]: 
-        // parsed:, offset 210, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 212, len 4, h: length: 00000010
-        // .  .  .  .  
-           00 00 00 10 
-        // parsed:, offset 216, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 218, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 220, len 4, h: code_length: 00000004
-        // .  .  .  .  
-           00 00 00 04 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 2, h: 0001: newarray int
-        // .  .  
-//@mod     bc 0a    
-           bc 03 
-        // parsed:, offset 3, len 1, h: 0003: areturn
-        // .  
-           b0 
-        // parsed:, offset 228, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 230, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 232, len 0, h: end attributes[0] 
-// parsed:, offset 232, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)[I
-// parsed:, offset 232, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 234, len 0, h:  attributes[0]: 
-    // parsed:, offset 234, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 236, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 240, len 2, h: source: utf8{"T_newarray_5.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 242, len 0, h: end attributes[0] 
-// parsed:, offset 242, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_5.j b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_5.j
deleted file mode 100644
index 06737b4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_5.j
+++ /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 T_newarray_5.java
-.class public dxc/junit/opcodes/newarray/jm/T_newarray_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)[I
-    .limit locals 2
-    .limit stack 2
-    iload_1
-    newarray int
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_5.java b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_5.java
deleted file mode 100644
index 7ad3257..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_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 dxc.junit.opcodes.newarray.jm;
-
-public class T_newarray_5 {
-
-    public int[] run(int sz) {
-        return new int[sz];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_6.j b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_6.j
deleted file mode 100644
index db58795..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_6.j
+++ /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_newarray_6.java
-.class public dxc/junit/opcodes/newarray/jm/T_newarray_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)[I
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    newarray int
-    areturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_6.java b/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_6.java
deleted file mode 100644
index 6729fa4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/newarray/jm/T_newarray_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 dxc.junit.opcodes.newarray.jm;
-
-public class T_newarray_6 {
-    
-    public int[] run(int sz) {
-        return new int[sz];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/nop/Test_nop.java b/tools/dx-tests/src/dxc/junit/opcodes/nop/Test_nop.java
deleted file mode 100644
index 78e019b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/nop/Test_nop.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 dxc.junit.opcodes.nop;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.opcodes.nop.jm.T_nop_1;
-
-public class Test_nop extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_nop_1 t = new T_nop_1();
-        // how do we test nop - e.g. push some data onto the stack, and
-        // test if nothing has changed
-        assertTrue(t.run());
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/nop/jm/T_nop_1.j b/tools/dx-tests/src/dxc/junit/opcodes/nop/jm/T_nop_1.j
deleted file mode 100644
index d4ddbed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/nop/jm/T_nop_1.j
+++ /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_nop_1.java
-.class public dxc/junit/opcodes/nop/jm/T_nop_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 4
-    ldc2_w 12345678
-    nop
-    nop
-    nop
-    nop
-    nop
-    dup2
-    nop
-    nop
-    nop
-    lcmp
-    ifne Label0
-    iconst_1
-    ireturn
-Label0:
-    iconst_0    
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/nop/jm/T_nop_1.java b/tools/dx-tests/src/dxc/junit/opcodes/nop/jm/T_nop_1.java
deleted file mode 100644
index be36869..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/nop/jm/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 dxc.junit.opcodes.nop.jm;
-
-public class T_nop_1 {
-
-    public boolean run() {
-      return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/Test_opc_goto.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/Test_opc_goto.java
deleted file mode 100644
index b4a9ccc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/Test_opc_goto.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 dxc.junit.opcodes.opc_goto;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.opc_goto.jm.T_opc_goto_1;
-import dxc.junit.opcodes.opc_goto.jm.T_opc_goto_5;
-
-public class Test_opc_goto extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_opc_goto_1 t = new T_opc_goto_1();
-        assertEquals(0, t.run(20));
-    }
-
-    /**
-     * @title normal test
-     */
-    public void testN2() {
-        T_opc_goto_1 t = new T_opc_goto_1();
-        assertEquals(-20, t.run(-20));
-    }
-
-    /**
-     * @title  negative offset
-     */
-    public void testN3() {
-        T_opc_goto_5 t = new T_opc_goto_5();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target is inside instruction
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.opc_goto.jm.T_opc_goto_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.opc_goto.jm.T_opc_goto_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.7
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.opc_goto.jm.T_opc_goto_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_1.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_1.j
deleted file mode 100644
index 17477a9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_1.j
+++ /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_opc_goto_1.java
-.class public dxc/junit/opcodes/opc_goto/jm/T_opc_goto_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    goto Label0
-
-    Label1:
-    iinc 1 -1
-
-    Label0:
-    iload_1
-    ifgt Label1
-
-    iload_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_1.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_1.java
deleted file mode 100644
index 9e50e31..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/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 dxc.junit.opcodes.opc_goto.jm;
-
-public class T_opc_goto_1 {
-
-    public int run(int a) {
-        while (a > 0) {
-            a--;
-        }
-        return a;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2.cfh b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2.cfh
deleted file mode 100644
index 82dbe4f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2.cfh
+++ /dev/null
@@ -1,193 +0,0 @@
-//@class:dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000f
-// .  .  
-   00 0f 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 06 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0b 
-    // parsed:, offset 67, len 3, h: 0007: type{dxc.junit.opcodes.opc_goto.jm.T_opc_goto_2}
-    // .  .  .  
-       07 00 0a 
-    // parsed:, offset 70, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 77, len 3, h: 0009: string{"a"}
-    // .  .  .  
-       08 00 0c 
-    // parsed:, offset 80, len 45, h: 000a: utf8{"dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2"}
-    // .  .  *  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  o  p  c  _  g  o  t  o  /  j  m  /  T  _  o  p  c  _  g  o  t  o  _  2  
-       01 00 2a 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6f 70 63 5f 67 6f 74 6f 2f 6a 6d 2f 54 5f 6f 70 63 5f 67 6f 74 6f 5f 32 
-    // parsed:, offset 125, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 131, len 4, h: 000c: utf8{"a"}
-    // .  .  .  a  
-       01 00 01 61 
-    // parsed:, offset 135, len 20, h: 000d: utf8{"T_opc_goto_2.java"}
-    // .  .  .  T  _  o  p  c  _  g  o  t  o  _  2  .  j  a  v  a  
-       01 00 11 54 5f 6f 70 63 5f 67 6f 74 6f 5f 32 2e 6a 61 76 61 
-    // parsed:, offset 155, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 158, len 0, h: end constant_pool
-// parsed:, offset 158, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 160, len 2, h: this_class: type{dxc.junit.opcodes.opc_goto.jm.T_opc_goto_2}
-// .  .  
-   00 07 
-// parsed:, offset 162, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 164, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 166, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 168, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 170, len:74,desc: ()V
-// parsed:, offset 170, len 0, h:  methods[0]: 
-    // parsed:, offset 170, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 172, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 174, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 176, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 178, len 0, h:  attributes[0]: 
-        // parsed:, offset 178, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 180, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 184, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 186, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 188, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 197, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 199, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 201, len 0, h: end attributes[0] 
-// parsed:, offset 201, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 201, len:43,desc: ()V
-// parsed:, offset 201, len 0, h:  methods[1]: 
-    // parsed:, offset 201, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 203, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 205, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 207, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 209, len 0, h:  attributes[0]: 
-        // parsed:, offset 209, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 211, len 4, h: length: 00000013
-        // .  .  .  .  
-           00 00 00 13 
-        // parsed:, offset 215, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 217, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 219, len 4, h: code_length: 00000007
-        // .  .  .  .  
-           00 00 00 07 
-        // parsed:, offset 0, len 3, h: 0000: goto 0004
-        // .  .  .  
-//@mod:    a7 00 04 
-// we jump to the parameter of a byte code (was: ldc, now: string "a"), so this 
-// must be rejected by the verifier            
-           a7 00 05
-        // parsed:, offset 3, len 1, h: 0003: return
-        // .  
-           b1 
-        // parsed:, offset 4, len 2, h: 0004: ldc string{"a"}
-        // .  .  
-           12 09 
-        // parsed:, offset 6, len 1, h: 0006: return
-        // .  
-           b1 
-        // parsed:, offset 230, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 232, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 234, len 0, h: end attributes[0] 
-// parsed:, offset 234, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 234, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 236, len 0, h:  attributes[0]: 
-    // parsed:, offset 236, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 238, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 242, len 2, h: source: utf8{"T_opc_goto_2.java"}
-    // .  .  
-       00 0d 
-// parsed:, offset 244, len 0, h: end attributes[0] 
-// parsed:, offset 244, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2.j
deleted file mode 100644
index 9a155df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2.j
+++ /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_goto_2.java
-.class public dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    goto Label0
-    return
-Label0:    
-    ldc "a"
-    return
-.end method
-
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_2.java
deleted file mode 100644
index 344523d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_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 dxc.junit.opcodes.opc_goto.jm;
-
-public class T_opc_goto_2 {
-
-    public void run() {
-        String a = "a";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3.cfh b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3.cfh
deleted file mode 100644
index 89cfde8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3.cfh
+++ /dev/null
@@ -1,191 +0,0 @@
-//@class:dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000f
-// .  .  
-   00 0f 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 3, h: 0004: string{"a"}
-    // .  .  .  
-       08 00 0d 
-    // parsed:, offset 50, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 59, len 20, h: 0006: utf8{"T_opc_goto_3.java"}
-    // .  .  .  T  _  o  p  c  _  g  o  t  o  _  3  .  j  a  v  a  
-       01 00 11 54 5f 6f 70 63 5f 67 6f 74 6f 5f 33 2e 6a 61 76 61 
-    // parsed:, offset 79, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 85, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0c 
-    // parsed:, offset 90, len 3, h: 0009: type{dxc.junit.opcodes.opc_goto.jm.T_opc_goto_3}
-    // .  .  .  
-       07 00 0b 
-    // parsed:, offset 93, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 100, len 45, h: 000b: utf8{"dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3"}
-    // .  .  *  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  o  p  c  _  g  o  t  o  /  j  m  /  T  _  o  p  c  _  g  o  t  o  _  3  
-       01 00 2a 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6f 70 63 5f 67 6f 74 6f 2f 6a 6d 2f 54 5f 6f 70 63 5f 67 6f 74 6f 5f 33 
-    // parsed:, offset 145, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 151, len 4, h: 000d: utf8{"a"}
-    // .  .  .  a  
-       01 00 01 61 
-    // parsed:, offset 155, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 158, len 0, h: end constant_pool
-// parsed:, offset 158, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 160, len 2, h: this_class: type{dxc.junit.opcodes.opc_goto.jm.T_opc_goto_3}
-// .  .  
-   00 09 
-// parsed:, offset 162, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 164, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 166, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 168, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 170, len:74,desc: ()V
-// parsed:, offset 170, len 0, h:  methods[0]: 
-    // parsed:, offset 170, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 172, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 174, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 176, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 178, len 0, h:  attributes[0]: 
-        // parsed:, offset 178, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 180, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 184, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 186, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 188, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 197, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 199, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 201, len 0, h: end attributes[0] 
-// parsed:, offset 201, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 201, len:43,desc: ()V
-// parsed:, offset 201, len 0, h:  methods[1]: 
-    // parsed:, offset 201, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 203, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 205, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 207, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 209, len 0, h:  attributes[0]: 
-        // parsed:, offset 209, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 211, len 4, h: length: 00000013
-        // .  .  .  .  
-           00 00 00 13 
-        // parsed:, offset 215, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 217, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 219, len 4, h: code_length: 00000007
-        // .  .  .  .  
-           00 00 00 07 
-        // parsed:, offset 0, len 3, h: 0000: goto 0004
-        // .  .  .  
-//@mod           a7 00 04 
-           a7 00 ff 
-        // parsed:, offset 3, len 1, h: 0003: return
-        // .  
-           b1 
-        // parsed:, offset 4, len 2, h: 0004: ldc string{"a"}
-        // .  .  
-           12 04 
-        // parsed:, offset 6, len 1, h: 0006: return
-        // .  
-           b1 
-        // parsed:, offset 230, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 232, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 234, len 0, h: end attributes[0] 
-// parsed:, offset 234, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 234, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 236, len 0, h:  attributes[0]: 
-    // parsed:, offset 236, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 238, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 242, len 2, h: source: utf8{"T_opc_goto_3.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 244, len 0, h: end attributes[0] 
-// parsed:, offset 244, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3.j
deleted file mode 100644
index 926612c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3.j
+++ /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_goto_3.java
-.class public dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    goto Label0
-    return
-Label0:    
-    ldc "a"
-    return
-.end method
-
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_3.java
deleted file mode 100644
index 243af4f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_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 dxc.junit.opcodes.opc_goto.jm;
-
-public class T_opc_goto_3 {
-
-    public void run() {
-        String a = "a";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4.cfh
deleted file mode 100644
index 1b60dd5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4.cfh
+++ /dev/null
@@ -1,182 +0,0 @@
-//@class:dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 06 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0b 
-    // parsed:, offset 67, len 3, h: 0007: type{dxc.junit.opcodes.opc_goto.jm.T_opc_goto_4}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 70, len 45, h: 0008: utf8{"dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4"}
-    // .  .  *  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  o  p  c  _  g  o  t  o  /  j  m  /  T  _  o  p  c  _  g  o  t  o  _  4  
-       01 00 2a 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6f 70 63 5f 67 6f 74 6f 2f 6a 6d 2f 54 5f 6f 70 63 5f 67 6f 74 6f 5f 34 
-    // parsed:, offset 115, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 122, len 20, h: 000a: utf8{"T_opc_goto_4.java"}
-    // .  .  .  T  _  o  p  c  _  g  o  t  o  _  4  .  j  a  v  a  
-       01 00 11 54 5f 6f 70 63 5f 67 6f 74 6f 5f 34 2e 6a 61 76 61 
-    // parsed:, offset 142, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 148, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 151, len 0, h: end constant_pool
-// parsed:, offset 151, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 153, len 2, h: this_class: type{dxc.junit.opcodes.opc_goto.jm.T_opc_goto_4}
-// .  .  
-   00 07 
-// parsed:, offset 155, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 157, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 159, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 161, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 163, len:75,desc: ()V
-// parsed:, offset 163, len 0, h:  methods[0]: 
-    // parsed:, offset 163, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 165, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 167, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 169, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 171, len 0, h:  attributes[0]: 
-        // parsed:, offset 171, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 173, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 177, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 179, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 181, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 190, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 192, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 194, len 0, h: end attributes[0] 
-// parsed:, offset 194, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 194, len:44,desc: ()V
-// parsed:, offset 194, len 0, h:  methods[1]: 
-    // parsed:, offset 194, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 196, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 198, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 200, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 202, len 0, h:  attributes[0]: 
-        // parsed:, offset 202, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 204, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 208, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 210, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 212, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 3, h: 0000: goto 0003
-        // .  .  .  
-//@mod           a7 00 03 
-           a7 00 04 
-        // parsed:, offset 3, len 4, h: 0003: wide aload 0000
-        // .  .  .  .  
-           c4 19 00 00 
-        // parsed:, offset 7, len 1, h: 0007: return
-        // .  
-           b1 
-        // parsed:, offset 224, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 226, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 228, len 0, h: end attributes[0] 
-// parsed:, offset 228, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 228, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 230, len 0, h:  attributes[0]: 
-    // parsed:, offset 230, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 232, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 236, len 2, h: source: utf8{"T_opc_goto_4.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 238, len 0, h: end attributes[0] 
-// parsed:, offset 238, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4.j
deleted file mode 100644
index 9fda78a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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 dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    goto Label0
-Label0:    
-    aload_w 0
-    return
-.end method
-
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_4.java
deleted file mode 100644
index 1b6e4ab..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_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 dxc.junit.opcodes.opc_goto.jm;
-
-public class T_opc_goto_4 {
-
-    public void run() {
-        String a = "a";
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_5.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_5.j
deleted file mode 100644
index 12e5804..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_5.j
+++ /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_opc_goto_5.java
-.class public dxc/junit/opcodes/opc_goto/jm/T_opc_goto_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    goto Label1
-Label0:
-    nop
-    nop
-    nop
-    iconst_1
-    ireturn
-Label1:    
-    goto Label0
-    iconst_0
-    ireturn
-.end method
-
-
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_5.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_5.java
deleted file mode 100644
index 61d7c4d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_goto/jm/T_opc_goto_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 dxc.junit.opcodes.opc_goto.jm;
-
-public class T_opc_goto_5 {
-
-    public boolean run() {
-        return true;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/TestStubs.java
deleted file mode 100644
index 03fb771..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/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 dxc.junit.opcodes.opc_instanceof;
-
-public class TestStubs {
-    @SuppressWarnings("unused")
-    private class TestStub {
-        // testE1
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/Test_opc_instanceof.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/Test_opc_instanceof.java
deleted file mode 100644
index b5278df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/Test_opc_instanceof.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 dxc.junit.opcodes.opc_instanceof;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_1;
-import dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_2;
-import dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_3;
-import dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_7;
-
-public class Test_opc_instanceof extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_opc_instanceof_1 t = new T_opc_instanceof_1();
-        assertTrue(t.run(""));
-    }
-
-    /**
-     * @title check null value
-     */
-    public void testN2() {
-        T_opc_instanceof_1 t = new T_opc_instanceof_1();
-        assertFalse(t.run(null));
-    }
-
-    /**
-     * @title normal test
-     */
-    public void testN3() {
-        T_opc_instanceof_1 t = new T_opc_instanceof_1();
-        assertFalse(t.run(this));
-    }
-
-    /**
-     * @title normal test
-     */
-    public void testN4() {
-        // @uses dxc.junit.opcodes.opc_instanceof.jm.SubClass
-        // @uses dxc.junit.opcodes.opc_instanceof.jm.SuperClass
-        // @uses dxc.junit.opcodes.opc_instanceof.jm.SuperInterface
-        // @uses dxc.junit.opcodes.opc_instanceof.jm.SuperInterface2
-        T_opc_instanceof_2 t = new T_opc_instanceof_2();
-        assertEquals(0, t.run());
-    }
-
-    /**
-     * @title expected IllegalAccessError
-     */
-    public void testE1() {
-        // @uses dxc.junit.opcodes.opc_instanceof.jm.TestStubs$TestStub
-        T_opc_instanceof_3 t = new T_opc_instanceof_3();
-        try {
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NoClassDefFoundError
-     */
-    public void testE2() {
-        T_opc_instanceof_7 t = new T_opc_instanceof_7();
-        try {
-            t.run();
-            fail("expected NoClassDefFoundError");
-        } catch (NoClassDefFoundError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-    
-    /**
-     * @constraint 4.8.1.16
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE3() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.16
-     * @title constant pool type
-     */
-    public void testVFE4() {
-        try {
-            Class
-                    .forName("dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_1.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_1.j
deleted file mode 100644
index 07c0fd9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_1.j
+++ /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 T_opc_instanceof_1.java
-.class public dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 1
-    .limit locals 2
-    aload_1
-    instanceof java/lang/String
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_1.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_1.java
deleted file mode 100644
index c9a44fb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_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 dxc.junit.opcodes.opc_instanceof.jm;
-
-public class T_opc_instanceof_1 {
-
-    public boolean run(Object o) {
-        return (o instanceof String);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_2.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_2.j
deleted file mode 100644
index f5a5675..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_2.j
+++ /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.
-
-.source T_opc_instanceof_2.java
-.class public dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-    .limit locals 2
-    
-; (SubClass instanceof SuperClass)    
-    new        dxc/junit/opcodes/opc_instanceof/jm/SubClass
-    dup
-    invokespecial dxc/junit/opcodes/opc_instanceof/jm/SubClass.<init>()V
-    instanceof dxc/junit/opcodes/opc_instanceof/jm/SuperClass
-    ifne Label1
-    iconst_1
-    goto LabelExit
-
-Label1:        
-; !(SuperClass instanceof SubClass)    
-    new dxc/junit/opcodes/opc_instanceof/jm/SuperClass
-    dup
-    invokespecial dxc/junit/opcodes/opc_instanceof/jm/SuperClass.<init>()V
-    instanceof dxc/junit/opcodes/opc_instanceof/jm/SubClass
-    ifeq Label2
-    iconst_2
-    goto LabelExit
-    
-Label2:        
-; (SubClass instanceof SuperInterface)    
-    new dxc/junit/opcodes/opc_instanceof/jm/SubClass
-    dup
-    invokespecial dxc/junit/opcodes/opc_instanceof/jm/SubClass.<init>()V    
-    instanceof dxc/junit/opcodes/opc_instanceof/jm/SuperInterface
-    ifne Label3
-    iconst_3
-    goto LabelExit    
-    
-Label3:        
-; !(SubClass instanceof SuperInterface2)    
-    new dxc/junit/opcodes/opc_instanceof/jm/SubClass
-    dup
-    invokespecial dxc/junit/opcodes/opc_instanceof/jm/SubClass.<init>()V    
-    instanceof dxc/junit/opcodes/opc_instanceof/jm/SuperInterface2
-    ifeq Label4
-    iconst_4
-    goto LabelExit        
-    
-Label4:
-; !(SubClass[] instanceof SuperInterface)    
-    iconst_1
-    anewarray dxc/junit/opcodes/opc_instanceof/jm/SubClass
-    instanceof dxc/junit/opcodes/opc_instanceof/jm/SuperInterface
-    ifeq Label6
-    sipush 5
-    goto LabelExit        
-    
-Label6:        
-; (SubClass[] instanceof Object)    
-    iconst_1
-    anewarray dxc/junit/opcodes/opc_instanceof/jm/SubClass
-    instanceof java/lang/Object
-    ifne Label7
-    sipush 7
-    goto LabelExit        
-
-Label7:        
-; !(SubClass[] instanceof SubClass)    
-    iconst_1
-    anewarray dxc/junit/opcodes/opc_instanceof/jm/SubClass
-    instanceof dxc/junit/opcodes/opc_instanceof/jm/SubClass
-    ifeq Label8
-    sipush 8
-    goto LabelExit    
-    
-Label8:        
-; (SubClass[] instanceof SuperClass[])    
-    iconst_1
-    anewarray dxc/junit/opcodes/opc_instanceof/jm/SubClass
-    instanceof [Ldxc/junit/opcodes/opc_instanceof/jm/SuperClass;
-    ifne Label9
-    sipush 9
-    goto LabelExit
-    
-Label9:        
-; !(SuperClass[] instanceof SubClass[])    
-    iconst_1
-    anewarray dxc/junit/opcodes/opc_instanceof/jm/SuperClass
-    instanceof [Ldxc/junit/opcodes/opc_instanceof/jm/SubClass;
-    ifeq Label0
-    sipush 10
-    goto LabelExit    
-        
-Label0:    
-    iconst_0
-LabelExit:
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_2.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_2.java
deleted file mode 100644
index fa3a477..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_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 dxc.junit.opcodes.opc_instanceof.jm;
-
-public class T_opc_instanceof_2 {
-
-    public int run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_3.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_3.j
deleted file mode 100644
index cd0e33a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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_instanceof_3.java
-.class public dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 3
-    .limit locals 4
-    aload_0
-    instanceof [[[Ldxc/junit/opcodes/opc_instanceof/TestStubs$TestStub;
-    pop
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_3.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_3.java
deleted file mode 100644
index 919d541..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_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 dxc.junit.opcodes.opc_instanceof.jm;
-
-public class T_opc_instanceof_3 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4.cfh
deleted file mode 100644
index 6282aac..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4.cfh
+++ /dev/null
@@ -1,191 +0,0 @@
-//@class:dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0010
-// .  .  
-   00 10 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 57, h: 0003: utf8{"dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4"}
-    // .  .  6  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  o  p  c  _  i  n  s  t  a  n  c  e  o  f  /  j  m  /  T  _  o  p  c  _  i  n  s  t  a  n  c  e  o  f  _  4  
-       01 00 36 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6f 70 63 5f 69 6e 73 74 61 6e 63 65 6f 66 2f 6a 6d 2f 54 5f 6f 70 63 5f 69 6e 73 74 61 6e 63 65 6f 66 5f 34 
-    // parsed:, offset 91, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 104, len 24, h: 0005: utf8{"(Ljava/lang/Object;)Z"}
-    // .  .  .  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  Z  
-       01 00 15 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 5a 
-    // parsed:, offset 128, len 19, h: 0006: utf8{"java/lang/String"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 
-    // parsed:, offset 147, len 9, h: 0007: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 156, len 6, h: 0008: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 162, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 07 00 0c 
-    // parsed:, offset 167, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 174, len 3, h: 000b: type{java.lang.String}
-    // .  .  .  
-       07 00 06 
-    // parsed:, offset 177, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 183, len 26, h: 000d: utf8{"T_opc_instanceof_4.java"}
-    // .  .  .  T  _  o  p  c  _  i  n  s  t  a  n  c  e  o  f  _  4  .  j  a  v  a  
-       01 00 17 54 5f 6f 70 63 5f 69 6e 73 74 61 6e 63 65 6f 66 5f 34 2e 6a 61 76 61 
-    // parsed:, offset 209, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 212, len 3, h: 000f: type{dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_4}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 215, len 0, h: end constant_pool
-// parsed:, offset 215, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 217, len 2, h: this_class: type{dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_4}
-// .  .  
-   00 0f 
-// parsed:, offset 219, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 221, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 223, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 225, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 227, len:72,desc: ()V
-// parsed:, offset 227, len 0, h:  methods[0]: 
-    // parsed:, offset 227, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 229, len 2, h: name: <init>
-    // .  .  
-       00 07 
-    // parsed:, offset 231, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 233, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 235, len 0, h:  attributes[0]: 
-        // parsed:, offset 235, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 237, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 241, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 243, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 245, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 254, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 256, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 258, len 0, h: end attributes[0] 
-// parsed:, offset 258, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 258, len:41,desc: (Ljava/lang/Object;)Z
-// parsed:, offset 258, len 0, h:  methods[1]: 
-    // parsed:, offset 258, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 260, len 2, h: name: run
-    // .  .  
-       00 08 
-    // parsed:, offset 262, len 2, h: descriptor: (Ljava/lang/Object;)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 264, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 266, len 0, h:  attributes[0]: 
-        // parsed:, offset 266, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 268, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 272, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 274, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 276, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 1, len 3, h: 0001: instanceof type{java.lang.String}
-        // .  .  .  
-//@mod           c1 00 0b 
-           c1 01 0b 
-        // parsed:, offset 4, len 1, h: 0004: ireturn
-        // .  
-           ac 
-        // parsed:, offset 285, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 287, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 289, len 0, h: end attributes[0] 
-// parsed:, offset 289, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/Object;)Z
-// parsed:, offset 289, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 291, len 0, h:  attributes[0]: 
-    // parsed:, offset 291, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 293, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 297, len 2, h: source: utf8{"T_opc_instanceof_4.java"}
-    // .  .  
-       00 0d 
-// parsed:, offset 299, len 0, h: end attributes[0] 
-// parsed:, offset 299, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4.j
deleted file mode 100644
index ecef8ec..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4.j
+++ /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 T_opc_instanceof_4.java
-.class public dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 1
-    .limit locals 2
-    aload_1
-    instanceof java/lang/String
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_4.java
deleted file mode 100644
index decdb1c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_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 dxc.junit.opcodes.opc_instanceof.jm;
-
-public class T_opc_instanceof_4 {
-
-    public boolean run(Object o) {
-        return (o instanceof String);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_5.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_5.j
deleted file mode 100644
index 9765c16..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_5.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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_instanceof_5.java
-.class public dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 1
-    .limit locals 2
-
-    fconst_1
-    instanceof java/lang/String
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_5.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_5.java
deleted file mode 100644
index 29b53cd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_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 dxc.junit.opcodes.opc_instanceof.jm;
-
-public class T_opc_instanceof_5 {
-
-    public boolean run(Object o) {
-        return (o instanceof String);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_6.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_6.j
deleted file mode 100644
index fcba05c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_6.j
+++ /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 T_opc_instanceof_6.java
-.class public dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 1
-    .limit locals 2
-;    aload_1
-    instanceof java/lang/String
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_6.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_6.java
deleted file mode 100644
index 67ad4b9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_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 dxc.junit.opcodes.opc_instanceof.jm;
-
-public class T_opc_instanceof_6 {
-
-    public boolean run(Object o) {
-        return (o instanceof String);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_7.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_7.j
deleted file mode 100644
index 7010432..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_7.j
+++ /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_instanceof_7.java
-.class public dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 3
-    .limit locals 4
-    aload_0
-    ; next: class not found error
-    instanceof [[[Ldxc/junit/opcodes/opc_instanceof/foobar1;
-    pop
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_7.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_7.java
deleted file mode 100644
index 8842de6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_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 dxc.junit.opcodes.opc_instanceof.jm;
-
-public class T_opc_instanceof_7 {
-
-    public void run() {
-
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8.cfh b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8.cfh
deleted file mode 100644
index a680546..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0011
-// .  .  
-   00 11 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 10 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 3, h: 0003: type{java.lang.String}
-    // .  .  .  
-       07 00 0c 
-    // parsed:, offset 37, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 50, len 24, h: 0005: utf8{"(Ljava/lang/Object;)Z"}
-    // .  .  .  (  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  )  Z  
-       01 00 15 28 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 29 5a 
-    // parsed:, offset 74, len 26, h: 0006: utf8{"T_opc_instanceof_8.java"}
-    // .  .  .  T  _  o  p  c  _  i  n  s  t  a  n  c  e  o  f  _  8  .  j  a  v  a  
-       01 00 17 54 5f 6f 70 63 5f 69 6e 73 74 61 6e 63 65 6f 66 5f 38 2e 6a 61 76 61 
-    // parsed:, offset 100, len 9, h: 0007: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 109, len 6, h: 0008: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 115, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 07 00 0e 
-    // parsed:, offset 120, len 57, h: 000a: utf8{"dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8"}
-    // .  .  6  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  o  p  c  _  i  n  s  t  a  n  c  e  o  f  /  j  m  /  T  _  o  p  c  _  i  n  s  t  a  n  c  e  o  f  _  8  
-       01 00 36 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6f 70 63 5f 69 6e 73 74 61 6e 63 65 6f 66 2f 6a 6d 2f 54 5f 6f 70 63 5f 69 6e 73 74 61 6e 63 65 6f 66 5f 38 
-    // parsed:, offset 177, len 7, h: 000b: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 184, len 19, h: 000c: utf8{"java/lang/String"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  S  t  r  i  n  g  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 53 74 72 69 6e 67 
-    // parsed:, offset 203, len 3, h: 000d: type{dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_8}
-    // .  .  .  
-       07 00 0a 
-    // parsed:, offset 206, len 6, h: 000e: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 212, len 5, h: 000f: float{0x4048f5c3 / 3.14}
-    // .  @  H  .  .  
-       04 40 48 f5 c3 
-    // parsed:, offset 217, len 3, h: 0010: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 220, len 0, h: end constant_pool
-// parsed:, offset 220, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 222, len 2, h: this_class: type{dxc.junit.opcodes.opc_instanceof.jm.T_opc_instanceof_8}
-// .  .  
-   00 0d 
-// parsed:, offset 224, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 10 
-// parsed:, offset 226, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 228, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 230, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 232, len:75,desc: ()V
-// parsed:, offset 232, len 0, h:  methods[0]: 
-    // parsed:, offset 232, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 234, len 2, h: name: <init>
-    // .  .  
-       00 07 
-    // parsed:, offset 236, len 2, h: descriptor: ()V
-    // .  .  
-       00 0e 
-    // parsed:, offset 238, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 240, len 0, h:  attributes[0]: 
-        // parsed:, offset 240, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 242, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 246, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 248, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 250, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 259, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 261, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 263, len 0, h: end attributes[0] 
-// parsed:, offset 263, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 263, len:44,desc: (Ljava/lang/Object;)Z
-// parsed:, offset 263, len 0, h:  methods[1]: 
-    // parsed:, offset 263, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 265, len 2, h: name: run
-    // .  .  
-       00 08 
-    // parsed:, offset 267, len 2, h: descriptor: (Ljava/lang/Object;)Z
-    // .  .  
-       00 05 
-    // parsed:, offset 269, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 271, len 0, h:  attributes[0]: 
-        // parsed:, offset 271, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 273, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 277, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 279, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 281, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 2, h: 0000: ldc #4048f5c3 // 3.14
-        // .  .  
-           12 0f 
-        // parsed:, offset 2, len 1, h: 0002: pop
-        // W  
-           57 
-        // parsed:, offset 3, len 1, h: 0003: aload_1 // 01
-        // +  
-           2b 
-        // parsed:, offset 4, len 3, h: 0004: instanceof type{java.lang.String}
-        // .  .  .  
-//@mod           c1 00 03 
-           c1 00 0f 
-        // parsed:, offset 7, len 1, h: 0007: ireturn
-        // .  
-           ac 
-        // parsed:, offset 293, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 295, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 297, len 0, h: end attributes[0] 
-// parsed:, offset 297, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (Ljava/lang/Object;)Z
-// parsed:, offset 297, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 299, len 0, h:  attributes[0]: 
-    // parsed:, offset 299, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 301, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 305, len 2, h: source: utf8{"T_opc_instanceof_8.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 307, len 0, h: end attributes[0] 
-// parsed:, offset 307, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8.j
deleted file mode 100644
index 4dd3200..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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_instanceof_8.java
-.class public dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;)Z
-    .limit stack 1
-    .limit locals 2
-    
-    ldc 3.14
-    pop
-    
-    aload_1
-    instanceof java/lang/String
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_8.java
deleted file mode 100644
index 8a4990d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/T_opc_instanceof_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 dxc.junit.opcodes.opc_instanceof.jm;
-
-public class T_opc_instanceof_8 {
-
-    public boolean run(Object o) {
-        return (o instanceof String);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/TestStubs.java
deleted file mode 100644
index cf54729..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_instanceof/jm/TestStubs.java
+++ /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.
- */
-
-package dxc.junit.opcodes.opc_instanceof.jm;
-
-public class TestStubs {
-    @SuppressWarnings("unused")
-    private class TestStub {
-        // testE1
-    }
-}
-
-interface SuperInterface{
-    
-}
-
-interface SuperInterface2{
-    
-}
-
-class SuperClass implements SuperInterface{
-    
-}
-
-class SubClass extends SuperClass{
-
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/Test_opc_new.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/Test_opc_new.java
deleted file mode 100644
index 14b6c64..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/Test_opc_new.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 dxc.junit.opcodes.opc_new;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.opc_new.jm.T_opc_new_1;
-import dxc.junit.opcodes.opc_new.jm.T_opc_new_3;
-import dxc.junit.opcodes.opc_new.jm.T_opc_new_4;
-import dxc.junit.opcodes.opc_new.jm.T_opc_new_5;
-import dxc.junit.opcodes.opc_new.jm.T_opc_new_8;
-import dxc.junit.opcodes.opc_new.jm.T_opc_new_9;
-
-public class Test_opc_new extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_opc_new_1 t = new T_opc_new_1();
-        String s = t.run();
-        assertNotNull(s);
-        assertEquals(0, s.compareTo("abc"));
-    }
-
-    /**
-     * @title expected Error (exception during class loading)
-     */
-    public void testE1() {
-        try {
-            T_opc_new_3.run();
-            fail("expected Error");
-        } catch (Error e) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected IllegalAccessError
-     */
-    public void testE2() {
-        // @uses dxc.junit.opcodes.opc_new.jm.TestStubs$TestStub
-        try {
-            T_opc_new_4 t = new T_opc_new_4();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NoClassDefFoundError
-     */
-    public void testE3() {
-        try {
-            T_opc_new_5 t = new T_opc_new_5();
-            t.run();
-            fail("expected NoClassDefFoundError");
-        } catch (NoClassDefFoundError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.18 
-     * @title attempt to instantiate interface
-     */
-    public void testE4() {
-        // @uses dxc.junit.opcodes.opc_new.jm.TestInterface
-        try {
-            T_opc_new_8 t = new T_opc_new_8();
-            t.run();
-            fail("expected InstantiationError");
-        } catch (InstantiationError ie) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.18 
-     * @title attempt to instantiate abstract
-     * class
-     */
-    public void testE5() {
-        // @uses dxc.junit.opcodes.opc_new.jm.TestAbstractClass
-        T_opc_new_9 t = new T_opc_new_9();
-        try {
-            t.run();
-            fail("expected Error");
-        } catch (Error iae) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.16
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.opc_new.jm.T_opc_new_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.18
-     * @title attempt to create array using new
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.opc_new.jm.T_opc_new_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint n/a
-     * @title  Attempt to access uninitialized class (before <init> is
-     * called)
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.opc_new.jm.T_opc_new_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.16
-     * @title constant pool type
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.opc_new.jm.T_opc_new_10");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_1.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_1.j
deleted file mode 100644
index 63e9ddc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_1.j
+++ /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_new_1.java
-.class public dxc/junit/opcodes/opc_new/jm/T_opc_new_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 3
-    .limit locals 1
-
-    new java/lang/String
-    dup
-    ldc "abc"
-    invokespecial java/lang/String/<init>(Ljava/lang/String;)V
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_1.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_1.java
deleted file mode 100644
index 9dffdbd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_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 dxc.junit.opcodes.opc_new.jm;
-
-public class T_opc_new_1 {
-
-    public String run() {
-        return new String("abc");
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_10.cfh b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_10.cfh
deleted file mode 100644
index acc5a5d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_10.cfh
+++ /dev/null
@@ -1,197 +0,0 @@
-//@class:dxc/junit/opcodes/opc_new/jm/T_opc_new_10
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000f
-// .  .  
-   00 0f 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 08 
-    // parsed:, offset 15, len 44, h: 0002: utf8{"dxc/junit/opcodes/opc_new/jm/T_opc_new_10"}
-    // .  .  )  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  o  p  c  _  n  e  w  /  j  m  /  T  _  o  p  c  _  n  e  w  _  1  0  
-       01 00 29 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6f 70 63 5f 6e 65 77 2f 6a 6d 2f 54 5f 6f 70 63 5f 6e 65 77 5f 31 30 
-    // parsed:, offset 59, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 78, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 91, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 100, len 23, h: 0006: utf8{"()Ljava/lang/Object;"}
-    // .  .  .  (  )  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  
-       01 00 14 28 29 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 
-    // parsed:, offset 123, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 129, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 134, len 20, h: 0009: utf8{"T_opc_new_10.java"}
-    // .  .  .  T  _  o  p  c  _  n  e  w  _  1  0  .  j  a  v  a  
-       01 00 11 54 5f 6f 70 63 5f 6e 65 77 5f 31 30 2e 6a 61 76 61 
-    // parsed:, offset 154, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 161, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 167, len 5, h: 000c: float{0x4048f5c3 / 3.14}
-    // .  @  H  .  .  
-       04 40 48 f5 c3 
-    // parsed:, offset 172, len 3, h: 000d: type{dxc.junit.opcodes.opc_new.jm.T_opc_new_10}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 175, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 178, len 0, h: end constant_pool
-// parsed:, offset 178, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 180, len 2, h: this_class: type{dxc.junit.opcodes.opc_new.jm.T_opc_new_10}
-// .  .  
-   00 0d 
-// parsed:, offset 182, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 184, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 186, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 188, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 190, len:78,desc: ()V
-// parsed:, offset 190, len 0, h:  methods[0]: 
-    // parsed:, offset 190, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 192, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 194, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 196, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 198, len 0, h:  attributes[0]: 
-        // parsed:, offset 198, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 200, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 204, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 206, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 208, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 217, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 219, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 221, len 0, h: end attributes[0] 
-// parsed:, offset 221, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 221, len:47,desc: ()Ljava/lang/Object;
-// parsed:, offset 221, len 0, h:  methods[1]: 
-    // parsed:, offset 221, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 223, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 225, len 2, h: descriptor: ()Ljava/lang/Object;
-    // .  .  
-       00 06 
-    // parsed:, offset 227, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 229, len 0, h:  attributes[0]: 
-        // parsed:, offset 229, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 231, len 4, h: length: 00000017
-        // .  .  .  .  
-           00 00 00 17 
-        // parsed:, offset 235, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 237, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 239, len 4, h: code_length: 0000000b
-        // .  .  .  .  
-           00 00 00 0b 
-        // parsed:, offset 0, len 2, h: 0000: ldc #4048f5c3 // 3.14
-        // .  .  
-           12 0c 
-        // parsed:, offset 2, len 1, h: 0002: pop
-        // W  
-           57 
-        // parsed:, offset 3, len 3, h: 0003: new type{java.lang.Object}
-        // .  .  .  
-//@mod           bb 00 0e 
-           bb 00 0c 
-        // parsed:, offset 6, len 1, h: 0006: dup
-        // Y  
-           59 
-        // parsed:, offset 7, len 3, h: 0007: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 10, len 1, h: 000a: areturn
-        // .  
-           b0 
-        // parsed:, offset 254, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 256, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 258, len 0, h: end attributes[0] 
-// parsed:, offset 258, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()Ljava/lang/Object;
-// parsed:, offset 258, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 260, len 0, h:  attributes[0]: 
-    // parsed:, offset 260, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 262, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 266, len 2, h: source: utf8{"T_opc_new_10.java"}
-    // .  .  
-       00 09 
-// parsed:, offset 268, len 0, h: end attributes[0] 
-// parsed:, offset 268, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_10.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_10.j
deleted file mode 100644
index c55935f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_10.j
+++ /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_opc_new_10.java
-.class public dxc/junit/opcodes/opc_new/jm/T_opc_new_10
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/Object;
-    .limit stack 2
-    .limit locals 1
-
-    ldc 3.14
-    pop
-
-    new java/lang/Object
-    dup
-    invokespecial java/lang/Object/<init>()V
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_10.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_10.java
deleted file mode 100644
index 7b549bb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_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 dxc.junit.opcodes.opc_new.jm;
-
-public class T_opc_new_10 {
-
-    public Object run() {
-        return new Object();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_2.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_2.j
deleted file mode 100644
index 4dd2001..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_2.j
+++ /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_opc_new_2.java
-.class public dxc/junit/opcodes/opc_new/jm/T_opc_new_2
-.super java/lang/Object
-
-.field  i I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    aload_0
-    bipush 123
-    putfield dxc.junit.opcodes.opc_new.jm.T_opc_new_2.i I
-
-    return
-.end method
-
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/opcodes/opc_new/jm/T_opc_new_2
-    dup
-;    invokespecial dxc/junit/opcodes/opc_new/jm/T_opc_new_2/<init>()V
-    astore_0
-
-    aload_0
-    getfield dxc.junit.opcodes.opc_new.jm.T_opc_new_2.i I
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_2.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_2.java
deleted file mode 100644
index 4fe58d0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_2.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 dxc.junit.opcodes.opc_new.jm;
-
-public class T_opc_new_2 {
-    
-    int i = 123;
-
-    public static int run() {
-        T_opc_new_2 t = new T_opc_new_2();
-        return t.i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_3.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_3.j
deleted file mode 100644
index b7d35f8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_3.j
+++ /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_opc_new_3.java
-.class public dxc/junit/opcodes/opc_new/jm/T_opc_new_3
-.super java/lang/Object
-
-.field static i I
-
-.method static <clinit>()V
-    .limit stack 2
-    .limit locals 0
-
-    bipush 123
-    iconst_0
-    idiv
-    putstatic dxc.junit.opcodes.opc_new.jm.T_opc_new_3.i I
-
-    return
-
-.end method
-
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public static run()I
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/opcodes/opc_new/jm/T_opc_new_3
-    dup
-    invokespecial dxc/junit/opcodes/opc_new/jm/T_opc_new_3/<init>()V
-    astore_0
-
-    getstatic dxc.junit.opcodes.opc_new.jm.T_opc_new_3.i I
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_3.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_3.java
deleted file mode 100644
index 9a75f14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_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 dxc.junit.opcodes.opc_new.jm;
-
-public class T_opc_new_3 {
-
-    static int i = 123 / 0;
-
-    public static int run() {
-        T_opc_new_3 t = new T_opc_new_3();
-        return t.i;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_4.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_4.j
deleted file mode 100644
index e596e9e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_4.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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_new_4.java
-.class public dxc/junit/opcodes/opc_new/jm/T_opc_new_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/Object;
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/opcodes/opc_new/jm/TestStubs$TestStub
-    dup
-    invokespecial dxc/junit/opcodes/opc_new/jm/TestStubs$TestStub/<init>()V
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_4.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_4.java
deleted file mode 100644
index 2a340fa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_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 dxc.junit.opcodes.opc_new.jm;
-
-public class T_opc_new_4 {
-
-     public Object run() {
-            return null;
-     }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_5.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_5.j
deleted file mode 100644
index 8ddb620..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_5.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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_new_5.java
-.class public dxc/junit/opcodes/opc_new/jm/T_opc_new_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/Object;
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/opcodes/opc_new/jm/Foobar
-    dup
-    invokespecial dxc/junit/opcodes/opc_new/jm/Foobar/<init>()V
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_5.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_5.java
deleted file mode 100644
index 0892739..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_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 dxc.junit.opcodes.opc_new.jm;
-
-public class T_opc_new_5 {
-
-    public Object run() {
-        return null;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_6.cfh
deleted file mode 100644
index 10917fa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_6.cfh
+++ /dev/null
@@ -1,188 +0,0 @@
-//@class:dxc/junit/opcodes/opc_new/jm/T_opc_new_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 06 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0b 
-    // parsed:, offset 67, len 23, h: 0007: utf8{"()Ljava/lang/Object;"}
-    // .  .  .  (  )  L  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  ;  
-       01 00 14 28 29 4c 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 3b 
-    // parsed:, offset 90, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 97, len 43, h: 0009: utf8{"dxc/junit/opcodes/opc_new/jm/T_opc_new_6"}
-    // .  .  (  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  o  p  c  _  n  e  w  /  j  m  /  T  _  o  p  c  _  n  e  w  _  6  
-       01 00 28 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 6f 70 63 5f 6e 65 77 2f 6a 6d 2f 54 5f 6f 70 63 5f 6e 65 77 5f 36 
-    // parsed:, offset 140, len 3, h: 000a: type{dxc.junit.opcodes.opc_new.jm.T_opc_new_6}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 143, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 149, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 152, len 19, h: 000d: utf8{"T_opc_new_6.java"}
-    // .  .  .  T  _  o  p  c  _  n  e  w  _  6  .  j  a  v  a  
-       01 00 10 54 5f 6f 70 63 5f 6e 65 77 5f 36 2e 6a 61 76 61 
-// parsed:, offset 171, len 0, h: end constant_pool
-// parsed:, offset 171, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 173, len 2, h: this_class: type{dxc.junit.opcodes.opc_new.jm.T_opc_new_6}
-// .  .  
-   00 0a 
-// parsed:, offset 175, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 177, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 179, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 181, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 183, len:75,desc: ()V
-// parsed:, offset 183, len 0, h:  methods[0]: 
-    // parsed:, offset 183, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 185, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 187, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 189, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 191, len 0, h:  attributes[0]: 
-        // parsed:, offset 191, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 193, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 197, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 199, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 201, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 210, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 212, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 214, len 0, h: end attributes[0] 
-// parsed:, offset 214, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 214, len:44,desc: ()Ljava/lang/Object;
-// parsed:, offset 214, len 0, h:  methods[1]: 
-    // parsed:, offset 214, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 216, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 218, len 2, h: descriptor: ()Ljava/lang/Object;
-    // .  .  
-       00 07 
-    // parsed:, offset 220, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 222, len 0, h:  attributes[0]: 
-        // parsed:, offset 222, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 224, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 228, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 230, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 232, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 3, h: 0000: new type{java.lang.Object}
-        // .  .  .  
-//@mod           bb 00 0c 
-           bb 01 0c 
-        // parsed:, offset 3, len 1, h: 0003: dup
-        // Y  
-           59 
-        // parsed:, offset 4, len 3, h: 0004: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 7, len 1, h: 0007: areturn
-        // .  
-           b0 
-        // parsed:, offset 244, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 246, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 248, len 0, h: end attributes[0] 
-// parsed:, offset 248, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()Ljava/lang/Object;
-// parsed:, offset 248, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 250, len 0, h:  attributes[0]: 
-    // parsed:, offset 250, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 252, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 256, len 2, h: source: utf8{"T_opc_new_6.java"}
-    // .  .  
-       00 0d 
-// parsed:, offset 258, len 0, h: end attributes[0] 
-// parsed:, offset 258, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_6.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_6.j
deleted file mode 100644
index a6c2e14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_6.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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_new_6.java
-.class public dxc/junit/opcodes/opc_new/jm/T_opc_new_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/Object;
-    .limit stack 2
-    .limit locals 1
-
-    new java/lang/Object
-    dup
-    invokespecial java/lang/Object/<init>()V
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_6.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_6.java
deleted file mode 100644
index 3ff3df7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_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 dxc.junit.opcodes.opc_new.jm;
-
-public class T_opc_new_6 {
-
-    public Object run() {
-        return new Object();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_7.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_7.j
deleted file mode 100644
index 482b25e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_7.j
+++ /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_new_7.java
-.class public dxc/junit/opcodes/opc_new/jm/T_opc_new_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/Object;
-    .limit stack 2
-    .limit locals 1
-
-    new [Ljava/lang/Object;
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_7.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_7.java
deleted file mode 100644
index 37256b4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_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 dxc.junit.opcodes.opc_new.jm;
-
-public class T_opc_new_7 {
-
-    public Object run() {
-        return new Object();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_8.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_8.j
deleted file mode 100644
index 8ca522d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_8.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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_new_8.java
-.class public dxc/junit/opcodes/opc_new/jm/T_opc_new_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/Object;
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/opcodes/opc_new/jm/TestInterface
-    dup
-    invokespecial dxc/junit/opcodes/opc_new/jm/TestInterface/<init>()V
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_8.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_8.java
deleted file mode 100644
index dfe9621..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_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 dxc.junit.opcodes.opc_new.jm;
-
-public class T_opc_new_8 {
-
-    public Object run() {
-        return new Object();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_9.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_9.j
deleted file mode 100644
index 688c678..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_9.j
+++ /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_opc_new_9.java
-.class public dxc/junit/opcodes/opc_new/jm/T_opc_new_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()Ljava/lang/Object;
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/opcodes/opc_new/jm/TestAbstractClass
-    dup
-    invokespecial dxc/junit/opcodes/opc_new/jm/TestAbstractClass/<init>()V
-
-    aload_0
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_9.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_9.java
deleted file mode 100644
index 8999e7f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/T_opc_new_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 dxc.junit.opcodes.opc_new.jm;
-
-public class T_opc_new_9 {
-
-    public Object run() {
-        return new Object();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/TestStubs.java
deleted file mode 100644
index 7d8214a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_new/jm/TestStubs.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 dxc.junit.opcodes.opc_new.jm;
-
-
-interface TestInterface {
-    public abstract void test();
-}
-
-abstract class TestAbstractClass{
-    
-}
-
-public class TestStubs {
-    private static @SuppressWarnings("unused") class TestStub {
-        private TestStub() {
-            
-        }
-        // testE3
-    }
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/Test_opc_return.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/Test_opc_return.java
deleted file mode 100644
index 98b4c94..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/Test_opc_return.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.opc_return;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.opc_return.jm.T_opc_return_1;
-import dxc.junit.opcodes.opc_return.jm.T_opc_return_2;
-import dxc.junit.opcodes.opc_return.jm.T_opc_return_3;
-import dxc.junit.opcodes.opc_return.jm.T_opc_return_4;
-
-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  check that monitor is released by return
-     */
-    public void testN2() {
-        assertTrue(T_opc_return_2.execute());
-    }
-
-
-    /**
-     * @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
-        }
-    }
-
-    /**
-     * @title  Lock structural rule 1 is violated
-     */
-    public void testE2() {
-        T_opc_return_4 t = new T_opc_return_4();
-        try {
-            t.run();
-            // the JVM spec says that it is optional to implement the structural
-            // lock rules, see JVM spec 8.13 and monitorenter/exit opcodes.
-            System.out.print("dvmvfe:");
-            //fail("expected IllegalMonitorStateException");
-        } catch (IllegalMonitorStateException imse) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - int
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.opc_return.jm.T_opc_return_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title method's return type - reference
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.opc_return.jm.T_opc_return_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_1.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_1.j
deleted file mode 100644
index fe94d2e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_1.j
+++ /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.
-
-.source T_opc_return_1.java
-.class public dxc/junit/opcodes/opc_return/jm/T_opc_return_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit locals 6
-    .limit stack 6
-    
-    iconst_1
-    istore_1
-    iconst_2
-    istore_2
-    iconst_3
-    istore 3
-    
-    iconst_4
-    
-    invokestatic dxc/junit/opcodes/opc_return/jm/T_opc_return_1/test()V
-    
-    iconst_4
-    if_icmpne Label0
-    
-    iload_1
-    iconst_1
-    if_icmpne Label0
-    
-    iload_2
-    iconst_2
-    if_icmpne Label0
-    
-    iload_3
-    iconst_3
-    if_icmpne Label0    
-    
-    ldc 123456
-    ireturn
-
-Label1:
-    pop
-Label0:
-    iconst_0
-    ireturn
-
-.end method
-
-.method private static test()V
-    .limit locals 4
-    .limit stack 4
-    
-    ldc 0xaaa
-    istore_1
-    ldc 0xbbbb
-    istore_2
-    ldc 0xcccc
-    istore_3
-    
-    ldc 0xdddd
-    
-    ldc 0xcafe
-    return
-    
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_1.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_1.java
deleted file mode 100644
index b2170ff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_1.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 dxc.junit.opcodes.opc_return.jm;
-
-public class T_opc_return_1 {
-
-    public int run() {
-        return 123456;
-    }
-    
-    private static void test() {
-        int a = 0xaaaa;
-        int b = 0xbbbb;
-        int c = 0xcccc;
-        return;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_2.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_2.j
deleted file mode 100644
index b6f383b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_2.j
+++ /dev/null
@@ -1,159 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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_2.java
-.class public dxc/junit/opcodes/opc_return/jm/T_opc_return_2
-.super java/lang/Object
-.implements java/lang/Runnable
-
-.field  value I
-.field  failed Z
-
-.method public <init>()V
-    .limit stack 3
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.opc_return.jm.T_opc_return_2.value I
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.opcodes.opc_return.jm.T_opc_return_2.failed Z
-
-    return
-
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-   
-    iconst_0
-    istore_1
-
-Label4:
-    iload_1
-    sipush 1000
-    if_icmpge Label3
-
-    aload_0
-    invokespecial dxc/junit/opcodes/opc_return/jm/T_opc_return_2/test()V
-
-    iinc 1 1
-
-    goto Label4
-
-
-Label3:
-    return
-
-.end method
-
-
-
-.method private synchronized test()V
-    .limit stack 3
-    .limit locals 2
-    
-.line 16
-    aload_0
-    dup
-    getfield dxc.junit.opcodes.opc_return.jm.T_opc_return_2.value I
-    dup
-    istore_1
-
-    iconst_1
-    iadd
-    putfield dxc.junit.opcodes.opc_return.jm.T_opc_return_2.value I
-
-    iinc 1 1
-
-    invokestatic java/lang/Thread/yield()V
-
-    iload_1
-    aload_0
-    getfield dxc.junit.opcodes.opc_return.jm.T_opc_return_2.value I
-    if_icmpeq Label0
-
-    aload_0
-    iconst_1
-    putfield dxc.junit.opcodes.opc_return.jm.T_opc_return_2.failed Z
-
-Label0:
-    return
-.end method
-
-
-
-.method public static execute()Z
-    .limit stack 3
-    .limit locals 4
-
-    new dxc/junit/opcodes/opc_return/jm/T_opc_return_2
-    dup
-    invokespecial dxc/junit/opcodes/opc_return/jm/T_opc_return_2/<init>()V
-    astore_0
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_1
-
-    new java/lang/Thread
-    dup
-    aload_0
-    invokespecial java/lang/Thread/<init>(Ljava/lang/Runnable;)V
-    astore_2
-
-    aload_1
-    invokevirtual java/lang/Thread/start()V
-
-    aload_2
-    invokevirtual java/lang/Thread/start()V
-
-Label12:
-    ldc2_w 5000
-    invokestatic java/lang/Thread/sleep(J)V
-
-Label13:
-    goto Label0
-
-Label14:            ; exception handler
-    astore_3
-    goto Label3
-
-Label0:
-    aload_0
-    getfield dxc.junit.opcodes.opc_return.jm.T_opc_return_2.value I
-    sipush 2000
-    if_icmpne Label3
-
-    aload_0
-    getfield dxc.junit.opcodes.opc_return.jm.T_opc_return_2.failed Z
-    ifne Label3
-
-    iconst_1
-    ireturn
-
-Label3:
-    iconst_0
-    ireturn
-
-.catch java/lang/InterruptedException from Label12 to Label13 using Label14
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_2.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_2.java
deleted file mode 100644
index b70986f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_2.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.opc_return.jm;
-
-public class T_opc_return_2 implements Runnable {
-    public final static int CNT = 1000;
-    int value = 0;
-    boolean failed = false;
-    
-    public void run() {
-        for(int i = 0; i < CNT; i++) {
-            test();
-        }
-    }
-    
-    private synchronized void test()    {
-        value++;
-        int c = value;
-        Thread.yield();
-        if(c != value)
-            failed = true;
-    }
-    
-    public static boolean execute() {
-        T_opc_return_2 test = new T_opc_return_2();
-        Thread t1 = new Thread(test);
-        Thread t2 = new Thread(test);
-        
-        t1.start();
-        t2.start();
-        
-        try
-        {
-            Thread.sleep(5000);
-        }
-        catch(InterruptedException ie) {
-            return false;
-        }
-        
-        if(test.value != CNT * 2)
-            return false;
-        return !test.failed;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_3.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_3.j
deleted file mode 100644
index 33b99cc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_3.j
+++ /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_return_3.java
-.class public dxc/junit/opcodes/opc_return/jm/T_opc_return_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method private synchronized test()V
-    .limit stack 1
-    aload_0
-    monitorexit
-    return
-.end method
-
-
-
-.method public run()Z
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial dxc/junit/opcodes/opc_return/jm/T_opc_return_3/test()V
-
-    iconst_1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_3.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_3.java
deleted file mode 100644
index 1e1ee36..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/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 dxc.junit.opcodes.opc_return.jm;
-
-public class T_opc_return_3 {
-    
-    private synchronized void test() {
-        return;
-    }
-    
-    public boolean run() {
-        test();
-        return true;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_4.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_4.j
deleted file mode 100644
index 80c1778a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_4.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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_4.java
-.class public dxc/junit/opcodes/opc_return/jm/T_opc_return_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    monitorenter
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_4.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_4.java
deleted file mode 100644
index 89dddd5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_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 dxc.junit.opcodes.opc_return.jm;
-
-public class T_opc_return_4 {
-    
-    public void run() {
-        return;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_5.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_5.j
deleted file mode 100644
index aa2d8bc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_5.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR 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 dxc/junit/opcodes/opc_return/jm/T_opc_return_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_5.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_5.java
deleted file mode 100644
index 4025b84..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_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 dxc.junit.opcodes.opc_return.jm;
-
-public class T_opc_return_5 {
-
-    public void run() {
-        return;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_6.j b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_6.j
deleted file mode 100644
index f286394..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_6.j
+++ /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 T_opc_return_6.java
-.class public dxc/junit/opcodes/opc_return/jm/T_opc_return_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Ljava/lang/String;
-    .limit stack 1
-    .limit locals 1
-
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_6.java b/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_6.java
deleted file mode 100644
index 27def5e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/opc_return/jm/T_opc_return_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 dxc.junit.opcodes.opc_return.jm;
-
-public class T_opc_return_6 {
-    
-    public void run() {
-        return;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop/Test_pop.java b/tools/dx-tests/src/dxc/junit/opcodes/pop/Test_pop.java
deleted file mode 100644
index 893b425..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop/Test_pop.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 dxc.junit.opcodes.pop;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.pop.jm.T_pop_1;
-import dxc.junit.opcodes.pop.jm.T_pop_2;
-
-public class Test_pop extends DxTestCase {
-
-    /**
-     * @title  type of argument - int
-     */
-    public void testN1() {
-        T_pop_1 t = new T_pop_1();
-        assertEquals(1234, t.run());
-    }
-
-    /**
-     * @title  type of argument - float
-     */
-    public void testN2() {
-        T_pop_2 t = new T_pop_2();
-        assertEquals(1234f, t.run());
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.pop.jm.T_pop_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - long
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.pop.jm.T_pop_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_1.j b/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_1.j
deleted file mode 100644
index 730d4a6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_1.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_pop_1.java
-.class public dxc/junit/opcodes/pop/jm/T_pop_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-    .limit locals 2
-    
-    sipush 1234
-    sipush 5678
-    pop
-    
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_1.java b/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_1.java
deleted file mode 100644
index d1f799e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_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 dxc.junit.opcodes.pop.jm;
-
-public class T_pop_1 {
-
-    public int run() {
-        return 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_2.j b/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_2.j
deleted file mode 100644
index 19977d2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_pop_2.java
-.class public dxc/junit/opcodes/pop/jm/T_pop_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()F
-    .limit stack 2
-    .limit locals 2
-    ldc 1234.0
-    ldc 5678.0
-    pop
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_2.java b/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_2.java
deleted file mode 100644
index b14351a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_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 dxc.junit.opcodes.pop.jm;
-
-public class T_pop_2 {
-
-    public float run() {
-        return 1234f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_3.j b/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_3.j
deleted file mode 100644
index ce81ca5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_pop_3.java
-.class public dxc/junit/opcodes/pop/jm/T_pop_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 2
-    .limit locals 3
-    sipush 1234
-;    sipush 1234    
-    pop
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_3.java b/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_3.java
deleted file mode 100644
index 46c4574..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_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 dxc.junit.opcodes.pop.jm;
-
-public class T_pop_3 {
-
-    public int run() {
-        return 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_4.j b/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_4.j
deleted file mode 100644
index 3f9f52c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_4.j
+++ /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_pop_4.java
-.class public dxc/junit/opcodes/pop/jm/T_pop_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 3
-    .limit locals 3
-
-    sipush 1234
-    lconst_1
-
-    pop
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_4.java b/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_4.java
deleted file mode 100644
index 5c2bd53..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop/jm/T_pop_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 dxc.junit.opcodes.pop.jm;
-
-public class T_pop_4 {
-
-    public int run() {
-        return 1234;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop2/Test_pop2.java b/tools/dx-tests/src/dxc/junit/opcodes/pop2/Test_pop2.java
deleted file mode 100644
index 01af289..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop2/Test_pop2.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 dxc.junit.opcodes.pop2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.pop2.jm.T_pop2_1;
-import dxc.junit.opcodes.pop2.jm.T_pop2_2;
-
-public class Test_pop2 extends DxTestCase {
-
-    /**
-     * @title  type of argument - long
-     */
-    public void testN1() {
-        T_pop2_1 t = new T_pop2_1();
-        assertEquals(1234l, t.run());
-    }
-
-    /**
-     * @title  type of argument - double
-     */
-    public void testN2() {
-        T_pop2_2 t = new T_pop2_2();
-        assertEquals(1234d, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.pop2.jm.T_pop2_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.pop2.jm.T_pop2_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_1.j b/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_1.j
deleted file mode 100644
index ce2c92a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_1.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_pop2_1.java
-.class public dxc/junit/opcodes/pop2/jm/T_pop2_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()J
-    .limit stack 4
-    .limit locals 2
-    
-    ldc2_w 1234
-    ldc2_w 5678
-    pop2
-    
-    lreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_1.java b/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_1.java
deleted file mode 100644
index 5d21090..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_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 dxc.junit.opcodes.pop2.jm;
-
-public class T_pop2_1 {
-
-    public long run() {
-        return 1234l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_2.j b/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_2.j
deleted file mode 100644
index d184609..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_pop2_2.java
-.class public dxc/junit/opcodes/pop2/jm/T_pop2_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()D
-    .limit stack 4
-    .limit locals 2
-    ldc2_w 1234.0
-    ldc2_w 5678.0
-    pop2
-    dreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_2.java b/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_2.java
deleted file mode 100644
index 329658a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_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 dxc.junit.opcodes.pop2.jm;
-
-public class T_pop2_2 {
-
-    public double run() {
-        return 1234d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_3.j b/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_3.j
deleted file mode 100644
index 82b7a69..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_3.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_pop2_3.java
-.class public dxc/junit/opcodes/pop2/jm/T_pop2_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()J
-    .limit stack 2
-    .limit locals 3
-    ldc2_w 1234
-;    ldc2_w 1234    
-    pop2
-    lreturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_3.java b/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_3.java
deleted file mode 100644
index 1b5fefc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_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 dxc.junit.opcodes.pop2.jm;
-
-public class T_pop2_3 {
-
-    public long run() {
-        return 1234l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_4.j b/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_4.j
deleted file mode 100644
index 5b49788..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_4.j
+++ /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_pop2_4.java
-.class public dxc/junit/opcodes/pop2/jm/T_pop2_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()J
-    .limit stack 3
-    .limit locals 3
-
-    ldc2_w 1234
-    iconst_1
-
-    pop2
-
-    lreturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_4.java b/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_4.java
deleted file mode 100644
index 9b3c66e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/pop2/jm/T_pop2_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 dxc.junit.opcodes.pop2.jm;
-
-public class T_pop2_4 {
-
-    public long run() {
-        return 1234l;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/TPutfield.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/TPutfield.java
deleted file mode 100644
index e417405..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/TPutfield.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 dxc.junit.opcodes.putfield;
-
-class TPutfield {
-    // used by testE2
-    @SuppressWarnings("unused")
-    private int TestStubField = 0;
-
-    // used by testE7
-    protected int TestStubFieldP = 0;
-
-    // used by testE5
-    public final int TestStubFieldFinal = 0;
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/Test_putfield.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/Test_putfield.java
deleted file mode 100644
index dd9b11a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/Test_putfield.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 dxc.junit.opcodes.putfield;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.putfield.jm.T_putfield_1;
-import dxc.junit.opcodes.putfield.jm.T_putfield_10;
-import dxc.junit.opcodes.putfield.jm.T_putfield_11;
-import dxc.junit.opcodes.putfield.jm.T_putfield_12;
-import dxc.junit.opcodes.putfield.jm.T_putfield_13;
-import dxc.junit.opcodes.putfield.jm.T_putfield_14;
-import dxc.junit.opcodes.putfield.jm.T_putfield_15;
-import dxc.junit.opcodes.putfield.jm.T_putfield_16;
-import dxc.junit.opcodes.putfield.jm.T_putfield_18;
-import dxc.junit.opcodes.putfield.jm.T_putfield_2;
-import dxc.junit.opcodes.putfield.jm.T_putfield_7;
-import dxc.junit.opcodes.putfield.jm.T_putfield_8;
-import dxc.junit.opcodes.putfield.jm.T_putfield_9;
-
-public class Test_putfield extends DxTestCase {
-
-    /**
-     * @title  type - int
-     */
-    public void testN1() {
-        T_putfield_1 t = new T_putfield_1();
-        assertEquals(0, t.st_i1);
-        t.run();
-        assertEquals(1000000, t.st_i1);
-    }
-
-    /**
-     * @title  type - double
-     */
-    public void testN2() {
-        T_putfield_2 t = new T_putfield_2();
-        assertEquals(0d, t.st_d1);
-        t.run();
-        assertEquals(1000000d, t.st_d1);
-    }
-
-    /**
-     * @title  modification of final field
-     */
-    public void testN3() {
-        T_putfield_12 t = new T_putfield_12();
-        assertEquals(0, t.st_i1);
-        t.run();
-        assertEquals(1000000, t.st_i1);
-    }
-
-    /**
-     * @title  modification of protected field from subclass
-     */
-    public void testN4() {
-        // @uses dxc.junit.opcodes.putfield.jm.T_putfield_1
-        T_putfield_14 t = new T_putfield_14();
-        assertEquals(0, t.getProtectedField());
-        t.run();
-        assertEquals(1000000, t.getProtectedField());
-    }
-
-    /**
-     * @title  assignment compatible object references
-     */
-    public void testN5() {
-        // @uses dxc.junit.opcodes.putfield.jm.TChild
-        // @uses dxc.junit.opcodes.putfield.jm.TSuper
-        T_putfield_18 t = new T_putfield_18();
-        assertEquals(0, t.run().compareTo("xyz"));
-    }
-
-    /**
-     * @title  assignment compatible values
-     */
-    public void testN6() {
-        T_putfield_16 t = new T_putfield_16();
-        assertNull(t.o);
-        t.run();
-        assertEquals("", (String) t.o);
-    }
-
-    /**
-     * @title  attempt to set static field
-     */
-    public void testE1() {
-        try {
-            T_putfield_7 t = new T_putfield_7();
-            t.run();
-            fail("expected IncompatibleClassChangeError");
-        } catch (IncompatibleClassChangeError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  modification of non-accessible private field
-     */
-    public void testE2() {
-        // @uses dxc.junit.opcodes.putfield.TPutfield
-        try {
-            T_putfield_8 t = new T_putfield_8();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NullPointerException
-     */
-    public void testE3() {
-        T_putfield_9 t = new T_putfield_9();
-        try {
-            t.run();
-            fail("expected NullPointerException");
-        } catch (NullPointerException e) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected NoSuchFieldError
-     */
-    public void testE4() {
-        try {
-        T_putfield_10 t = new T_putfield_10();
-            t.run();
-            fail("expected NoSuchFieldError");
-        } catch (NoSuchFieldError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Modification of final field in other class
-     */
-    public void testE5() {
-        // @uses dxc.junit.opcodes.putfield.TPutfield
-        try {
-            T_putfield_11 t = new T_putfield_11();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-
-    //  FIXME: "fail" commented out temporarily - check
-    /**
-     * @title  modification of superclass' private field from subclass
-     * FIXME: is this a JVM bug?
-     */
-    public void testE6() {
-        // @uses dxc.junit.opcodes.putfield.jm.T_putfield_1
-        try {
-            T_putfield_15 t = new T_putfield_15();
-            assertEquals(0, t.getPvtField());
-            t.run();
-            assertEquals(10101, t.getPvtField());
-            //fail("expected IllegalAccessError");
-        } catch (IllegalAccessError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  modification of non-accessible protected field
-     */
-    public void testE7() {
-        // @uses dxc.junit.opcodes.putfield.TPutfield
-        try {
-            T_putfield_13 t = new T_putfield_13();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.12
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.putfield.jm.T_putfield_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.putfield.jm.T_putfield_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.17
-     * @title type of argument - float instead of
-     * int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.putfield.jm.T_putfield_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.17
-     * @title type of argument - assignment
-     * incompatible references
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.putfield.jm.T_putfield_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.17
-     * @title type of argument - assignment
-     * incompatible values
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.putfield.jm.T_putfield_20");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.16
-     * @title type of argument - assignment
-     * incompatible object references
-     */
-    public void testVFE6() {
-        // @uses dxc.junit.opcodes.putfield.jm.TChild
-        // @uses dxc.junit.opcodes.putfield.jm.TSuper
-        try {
-            Class.forName("dxc.junit.opcodes.putfield.jm.T_putfield_19");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_1.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_1.j
deleted file mode 100644
index 05a16e5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_1.j
+++ /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_putfield_1.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_1
-.super java/lang/Object
-
-.field public st_i1 I
-.field protected st_p1 I
-.field private st_pvt1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aload_0
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_1.st_i1 I
-    return
-.end method
-
-.method public getPvtField()I
-   aload_0    
-   getfield dxc.junit.opcodes.putfield.jm.T_putfield_1.st_pvt1 I
-   ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_1.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_1.java
deleted file mode 100644
index 23ae850..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_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/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_10.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_10.j
deleted file mode 100644
index 858ee70..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_10.j
+++ /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_putfield_10.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_10
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aload_0
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_10.st_i1N I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_10.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_10.java
deleted file mode 100644
index 361e4f8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_10.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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_10 {
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_11.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_11.j
deleted file mode 100644
index f11374f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_11.j
+++ /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_putfield_11.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-
-    new dxc/junit/opcodes/putfield/TPutfield
-    dup
-    invokespecial dxc/junit/opcodes/putfield/TPutfield/<init>()V
-
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.TPutfield.TestStubFieldFinal I
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_11.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_11.java
deleted file mode 100644
index e24a160..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_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 dxc.junit.opcodes.putfield.jm;
-
-
-public class T_putfield_11 {
-    public void run() {
-        
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_12.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_12.j
deleted file mode 100644
index 7650f55..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_12.j
+++ /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_putfield_12.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_12
-.super java/lang/Object
-
-.field public final st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aload_0
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_12.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_12.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_12.java
deleted file mode 100644
index c40a5e8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_12 {
-    public int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_13.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_13.j
deleted file mode 100644
index 0269325..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_13.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_putfield_13.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_13
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    
-    new dxc/junit/opcodes/putfield/TPutfield
-    dup
-    invokespecial dxc/junit/opcodes/putfield/TPutfield/<init>()V
-    
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.TPutfield.TestStubFieldP I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_13.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_13.java
deleted file mode 100644
index 3c2708b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_13.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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_13 {
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_14.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_14.j
deleted file mode 100644
index 4a7ef88..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_14.j
+++ /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_putfield_14.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_14
-.super dxc/junit/opcodes/putfield/jm/T_putfield_1
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/putfield/jm/T_putfield_1/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aload_0
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_1.st_p1 I
-    return
-.end method
-
-.method public getProtectedField()I
-    .limit stack 2
-    aload_0
-    getfield dxc.junit.opcodes.putfield.jm.T_putfield_1.st_p1 I
-    ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_14.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_14.java
deleted file mode 100644
index 8ba1e76..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_14 extends T_putfield_1{
-    
-    public void run() {
-        st_p1 = 1000000;
-    }
-    
-    public int getProtectedField(){
-        return st_p1;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_15.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_15.j
deleted file mode 100644
index ee2c082..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_15.j
+++ /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 T_putfield_15.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_15
-.super dxc/junit/opcodes/putfield/jm/T_putfield_1
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/putfield/jm/T_putfield_1/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aload_0
-    ldc 10101
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_1.st_pvt1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_15.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_15.java
deleted file mode 100644
index fabb97a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_15.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_15 extends T_putfield_1{
-    
-    public void run() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_16.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_16.j
deleted file mode 100644
index d62bb32..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_16.j
+++ /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_putfield_16.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_16
-.super java/lang/Object
-
-.field public o Ljava/lang/Object;
-
-
-.method public <init>()V
-    .limit stack 2
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    aconst_null
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_16.o Ljava/lang/Object;
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 4
-    .limit locals 2
-
-    aload_0
-    new java/lang/String
-    dup
-    ldc ""
-    invokespecial java/lang/String/<init>(Ljava/lang/String;)V
-
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_16.o Ljava/lang/Object;
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_16.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_16.java
deleted file mode 100644
index 3ea025e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_16.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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_16 {
-
-    public Object o = null;
-    
-    public void run() {
-        String s = new String("");
-        o = s;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_17.cfh b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_17.cfh
deleted file mode 100644
index b32c3df..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_17.cfh
+++ /dev/null
@@ -1,216 +0,0 @@
-//@class:dxc/junit/opcodes/putfield/jm/T_putfield_17
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 11 00 0a 
-    // parsed:, offset 15, len 5, h: 0002: field{dxc.junit.opcodes.putfield.jm.T_putfield_17.st_i1:I}
-    // .  .  .  .  .  
-       09 00 0c 00 10 
-    // parsed:, offset 20, len 46, h: 0003: utf8{"dxc/junit/opcodes/putfield/jm/T_putfield_17"}
-    // .  .  +  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  p  u  t  f  i  e  l  d  /  j  m  /  T  _  p  u  t  f  i  e  l  d  _  1  7  
-       01 00 2b 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 70 75 74 66 69 65 6c 64 2f 6a 6d 2f 54 5f 70 75 74 66 69 65 6c 64 5f 31 37 
-    // parsed:, offset 66, len 19, h: 0004: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 85, len 21, h: 0005: utf8{"T_putfield_17.java"}
-    // .  .  .  T  _  p  u  t  f  i  e  l  d  _  1  7  .  j  a  v  a  
-       01 00 12 54 5f 70 75 74 66 69 65 6c 64 5f 31 37 2e 6a 61 76 61 
-    // parsed:, offset 106, len 5, h: 0006: int{0x000f4240 / 1000000}
-    // .  .  .  B  @  
-       03 00 0f 42 40 
-    // parsed:, offset 111, len 13, h: 0007: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 124, len 9, h: 0008: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 133, len 6, h: 0009: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 139, len 5, h: 000a: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 08 00 0d 
-    // parsed:, offset 144, len 7, h: 000b: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 151, len 3, h: 000c: type{dxc.junit.opcodes.putfield.jm.T_putfield_17}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 154, len 6, h: 000d: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 160, len 8, h: 000e: utf8{"st_i1"}
-    // .  .  .  s  t  _  i  1  
-       01 00 05 73 74 5f 69 31 
-    // parsed:, offset 168, len 4, h: 000f: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 172, len 5, h: 0010: nat{st_i1:I}
-    // .  .  .  .  .  
-       0c 00 0e 00 0f 
-    // parsed:, offset 177, len 3, h: 0011: type{java.lang.Object}
-    // .  .  .  
-       07 00 04 
-// parsed:, offset 180, len 0, h: end constant_pool
-// parsed:, offset 180, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 182, len 2, h: this_class: type{dxc.junit.opcodes.putfield.jm.T_putfield_17}
-// .  .  
-   00 0c 
-// parsed:, offset 184, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 11 
-// parsed:, offset 186, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 188, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:st_i1, offset 190, len:84,desc: I
-// parsed:, offset 190, len 0, h:  fields[0]: 
-    // parsed:, offset 190, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 192, len 2, h: name: st_i1
-    // .  .  
-       00 0e 
-    // parsed:, offset 194, len 2, h: descriptor: I
-    // .  .  
-       00 0f 
-    // parsed:, offset 196, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 198, len 0, h: end fields[0] 
-// ========== end-ParseMember:st_i1, desc: I
-// parsed:, offset 198, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 200, len:74,desc: ()V
-// parsed:, offset 200, len 0, h:  methods[0]: 
-    // parsed:, offset 200, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 202, len 2, h: name: <init>
-    // .  .  
-       00 08 
-    // parsed:, offset 204, len 2, h: descriptor: ()V
-    // .  .  
-       00 0d 
-    // parsed:, offset 206, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 208, len 0, h:  attributes[0]: 
-        // parsed:, offset 208, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 210, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 214, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 216, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 218, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 227, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 229, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 231, len 0, h: end attributes[0] 
-// parsed:, offset 231, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 231, len:43,desc: ()V
-// parsed:, offset 231, len 0, h:  methods[1]: 
-    // parsed:, offset 231, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 233, len 2, h: name: run
-    // .  .  
-       00 09 
-    // parsed:, offset 235, len 2, h: descriptor: ()V
-    // .  .  
-       00 0d 
-    // parsed:, offset 237, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 239, len 0, h:  attributes[0]: 
-        // parsed:, offset 239, len 2, h: name: Code
-        // .  .  
-           00 0b 
-        // parsed:, offset 241, len 4, h: length: 00000013
-        // .  .  .  .  
-           00 00 00 13 
-        // parsed:, offset 245, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 247, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 249, len 4, h: code_length: 00000007
-        // .  .  .  .  
-           00 00 00 07 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 2, h: 0001: ldc #+000f4240
-        // .  .  
-           12 06 
-        // parsed:, offset 3, len 3, h: 0003: putfield field{dxc.junit.opcodes.putfield.jm.T_putfield_17.st_i1:I}
-        // .  .  .  
-//@mod           b5 00 02 
-           b5 00 06 
-        // parsed:, offset 6, len 1, h: 0006: return
-        // .  
-           b1 
-        // parsed:, offset 260, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 262, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 264, len 0, h: end attributes[0] 
-// parsed:, offset 264, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 264, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 266, len 0, h:  attributes[0]: 
-    // parsed:, offset 266, len 2, h: name: SourceFile
-    // .  .  
-       00 07 
-    // parsed:, offset 268, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 272, len 2, h: source: utf8{"T_putfield_17.java"}
-    // .  .  
-       00 05 
-// parsed:, offset 274, len 0, h: end attributes[0] 
-// parsed:, offset 274, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_17.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_17.j
deleted file mode 100644
index 03b2c62..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_17.j
+++ /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_putfield_17.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_17
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aload_0
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_17.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_17.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_17.java
deleted file mode 100644
index be58b94..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_17.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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_17 {
-
-    public int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_18.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_18.j
deleted file mode 100644
index 602550d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_18.j
+++ /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_putfield_18.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_18
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()Ljava/lang/String;
-    .limit stack 2
-    .limit locals 2
-
-    new dxc/junit/opcodes/putfield/jm/TChild
-    dup
-    invokespecial dxc/junit/opcodes/putfield/jm/TChild/<init>()V
-    astore_1
-
-    aload_1
-    ldc "xyz"
-    putfield dxc.junit.opcodes.putfield.jm.TSuper.s Ljava/lang/String;
-
-    aload_1
-    getfield dxc.junit.opcodes.putfield.jm.TChild.s Ljava/lang/String;
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_18.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_18.java
deleted file mode 100644
index 617bac2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_18.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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_18 {
-
-    public String run() {
-        TChild c = new TChild();
-        c.s = "xyz";
-        return c.s;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_19.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_19.j
deleted file mode 100644
index 3f61b8c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_19.j
+++ /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_putfield_19.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_19
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()Ljava/lang/Object;
-    .limit stack 2
-    .limit locals 2
-
-    new dxc/junit/opcodes/putfield/jm/TSuper
-    dup
-    invokespecial dxc/junit/opcodes/putfield/jm/TSuper/<init>()V
-    astore_1
-
-    aload_1
-    getfield dxc.junit.opcodes.putfield.jm.TChild.o Ljava/lang/Object;
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_19.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_19.java
deleted file mode 100644
index fd9d29e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_19.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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_19 {
-
-    public Object run() {
-        TChild c = new TChild();
-        return c.o;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_2.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_2.j
deleted file mode 100644
index 8414dfd..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_2.j
+++ /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_putfield_2.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_2
-.super java/lang/Object
-
-.field public st_d1 D
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 3
-    aload_0
-    ldc2_w 1000000.0
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_2.st_d1 D
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_2.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_2.java
deleted file mode 100644
index bd039eb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_2 {
-
-    public double st_d1;
-    
-    public void run() {
-        st_d1 = 1000000d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_20.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_20.j
deleted file mode 100644
index 7aaf9b5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_20.j
+++ /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_putfield_20.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_20
-.super java/lang/Object
-
-.field public v I
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    ldc 3.14
-    
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_20.v I
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_20.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_20.java
deleted file mode 100644
index ebe55eb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_20.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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_20 {
-
-    public int v;
-    
-    public void run() {
-        v = (int)3.14;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_3.cfh b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_3.cfh
deleted file mode 100644
index 887ad58..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_3.cfh
+++ /dev/null
@@ -1,216 +0,0 @@
-//@class:dxc/junit/opcodes/putfield/jm/T_putfield_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0e 00 06 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0b 
-    // parsed:, offset 67, len 7, h: 0007: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 74, len 5, h: 0008: field{dxc.junit.opcodes.putfield.jm.T_putfield_3.st_i1:I}
-    // .  .  .  .  .  
-       09 00 0f 00 0d 
-    // parsed:, offset 79, len 5, h: 0009: int{0x000f4240 / 1000000}
-    // .  .  .  B  @  
-       03 00 0f 42 40 
-    // parsed:, offset 84, len 20, h: 000a: utf8{"T_putfield_3.java"}
-    // .  .  .  T  _  p  u  t  f  i  e  l  d  _  3  .  j  a  v  a  
-       01 00 11 54 5f 70 75 74 66 69 65 6c 64 5f 33 2e 6a 61 76 61 
-    // parsed:, offset 104, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 110, len 8, h: 000c: utf8{"st_i1"}
-    // .  .  .  s  t  _  i  1  
-       01 00 05 73 74 5f 69 31 
-    // parsed:, offset 118, len 5, h: 000d: nat{st_i1:I}
-    // .  .  .  .  .  
-       0c 00 0c 00 10 
-    // parsed:, offset 123, len 3, h: 000e: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 126, len 3, h: 000f: type{dxc.junit.opcodes.putfield.jm.T_putfield_3}
-    // .  .  .  
-       07 00 11 
-    // parsed:, offset 129, len 4, h: 0010: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 133, len 45, h: 0011: utf8{"dxc/junit/opcodes/putfield/jm/T_putfield_3"}
-    // .  .  *  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  p  u  t  f  i  e  l  d  /  j  m  /  T  _  p  u  t  f  i  e  l  d  _  3  
-       01 00 2a 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 70 75 74 66 69 65 6c 64 2f 6a 6d 2f 54 5f 70 75 74 66 69 65 6c 64 5f 33 
-// parsed:, offset 178, len 0, h: end constant_pool
-// parsed:, offset 178, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 180, len 2, h: this_class: type{dxc.junit.opcodes.putfield.jm.T_putfield_3}
-// .  .  
-   00 0f 
-// parsed:, offset 182, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0e 
-// parsed:, offset 184, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 186, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:st_i1, offset 188, len:84,desc: I
-// parsed:, offset 188, len 0, h:  fields[0]: 
-    // parsed:, offset 188, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 190, len 2, h: name: st_i1
-    // .  .  
-       00 0c 
-    // parsed:, offset 192, len 2, h: descriptor: I
-    // .  .  
-       00 10 
-    // parsed:, offset 194, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 196, len 0, h: end fields[0] 
-// ========== end-ParseMember:st_i1, desc: I
-// parsed:, offset 196, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 198, len:74,desc: ()V
-// parsed:, offset 198, len 0, h:  methods[0]: 
-    // parsed:, offset 198, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 200, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 202, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 204, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 206, len 0, h:  attributes[0]: 
-        // parsed:, offset 206, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 208, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 212, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 214, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 216, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 225, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 227, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 229, len 0, h: end attributes[0] 
-// parsed:, offset 229, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 229, len:43,desc: ()V
-// parsed:, offset 229, len 0, h:  methods[1]: 
-    // parsed:, offset 229, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 231, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 233, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 235, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 237, len 0, h:  attributes[0]: 
-        // parsed:, offset 237, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 239, len 4, h: length: 00000013
-        // .  .  .  .  
-           00 00 00 13 
-        // parsed:, offset 243, len 2, h: max_stack: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 245, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 247, len 4, h: code_length: 00000007
-        // .  .  .  .  
-           00 00 00 07 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 2, h: 0001: ldc #+000f4240
-        // .  .  
-           12 09 
-        // parsed:, offset 3, len 3, h: 0003: putfield field{dxc.junit.opcodes.putfield.jm.T_putfield_3.st_i1:I}
-        // .  .  .  
-//@mod:           b5 00 08 
-           b5 01 08 
-        // parsed:, offset 6, len 1, h: 0006: return
-        // .  
-           b1 
-        // parsed:, offset 258, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 260, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 262, len 0, h: end attributes[0] 
-// parsed:, offset 262, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 262, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 264, len 0, h:  attributes[0]: 
-    // parsed:, offset 264, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 266, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 270, len 2, h: source: utf8{"T_putfield_3.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 272, len 0, h: end attributes[0] 
-// parsed:, offset 272, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_3.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_3.j
deleted file mode 100644
index 10d3f53..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_3.j
+++ /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_putfield_3.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_3
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aload_0
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_3.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_3.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_3.java
deleted file mode 100644
index 6c7216e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_3 {
-
-    public int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_4.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_4.j
deleted file mode 100644
index 5a4195a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_4.j
+++ /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_putfield_4.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_4
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aload_0
-;    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_4.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_4.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_4.java
deleted file mode 100644
index 142d193..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_4 {
-
-    public int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_5.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_5.j
deleted file mode 100644
index 6ccc8c0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_5.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_putfield_5.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_5
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aload_0
-;    ldc 1000000
-    fconst_1
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_5.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_5.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_5.java
deleted file mode 100644
index 9be3923..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_5 {
-
-    public int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_6.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_6.j
deleted file mode 100644
index 916a084..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_6.j
+++ /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_putfield_6.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_6
-.super java/lang/Object
-
-.field public s Ljava/lang/String;
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-
-    new java/lang/Object
-    dup
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_6.s Ljava/lang/String;
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_6.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_6.java
deleted file mode 100644
index 63855a0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_6.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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_6 {
-
-    public String s;
-    
-    public void run() {
-        Object o = new Object();
-        s = (String)o;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_7.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_7.j
deleted file mode 100644
index a3088a5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_7.j
+++ /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_putfield_7.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_7
-.super java/lang/Object
-
-.field public static st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aload_0
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_7.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_7.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_7.java
deleted file mode 100644
index 54bd49f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_7 {
-    public int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_8.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_8.j
deleted file mode 100644
index 07e9b12..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_8.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_putfield_8.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    
-    new dxc/junit/opcodes/putfield/TPutfield
-    dup
-    invokespecial dxc/junit/opcodes/putfield/TPutfield/<init>()V
-    
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.TPutfield.TestStubField I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_8.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_8.java
deleted file mode 100644
index 4860faf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_8 {
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_9.j b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_9.j
deleted file mode 100644
index 79bd8114..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_9.j
+++ /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_putfield_9.java
-.class public dxc/junit/opcodes/putfield/jm/T_putfield_9
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    aconst_null
-    ldc 1000000
-    putfield dxc.junit.opcodes.putfield.jm.T_putfield_9.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_9.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_9.java
deleted file mode 100644
index 33b7c7a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/T_putfield_9.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 dxc.junit.opcodes.putfield.jm;
-
-public class T_putfield_9 {
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/TestStubs.java
deleted file mode 100644
index de2dcc6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putfield/jm/TestStubs.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 dxc.junit.opcodes.putfield.jm;
-
-
-
-class TSuper {
-    public String s = "abc";
-}
-
-class TChild extends TSuper {
-    public Object o = null;    
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/TestStubs.java
deleted file mode 100644
index 64a481a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/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 dxc.junit.opcodes.putstatic;
-
-public class TestStubs {
-    // used by testE2
-    static int TestStubField = 0;
-
-    // used by testE5
-    public static final int TestStubFieldFinal = 0;
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/Test_putstatic.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/Test_putstatic.java
deleted file mode 100644
index 9d438d8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/Test_putstatic.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.putstatic;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_1;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_10;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_11;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_12;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_13;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_14;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_15;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_16;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_2;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_7;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_8;
-import dxc.junit.opcodes.putstatic.jm.T_putstatic_9;
-
-public class Test_putstatic extends DxTestCase {
-
-    /**
-     * @title  type - int
-     */
-    public void testN1() {
-        T_putstatic_1 t = new T_putstatic_1();
-        assertEquals(0, T_putstatic_1.st_i1);
-        t.run();
-        assertEquals(1000000, T_putstatic_1.st_i1);
-    }
-
-    /**
-     * @title  type - double
-     */
-    public void testN2() {
-        T_putstatic_2 t = new T_putstatic_2();
-        assertEquals(0d, T_putstatic_2.st_d1);
-        t.run();
-        assertEquals(1000000d, T_putstatic_2.st_d1);
-    }
-
-    /**
-     * @title  modification of final field
-     */
-    public void testN3() {
-        T_putstatic_12 t = new T_putstatic_12();
-        assertEquals(0, T_putstatic_12.st_i1);
-        t.run();
-        assertEquals(1000000, T_putstatic_12.st_i1);
-    }
-
-    /**
-     * @title  modification of protected field from subclass
-     */
-    public void testN4() {
-        // @uses dxc.junit.opcodes.putstatic.jm.T_putstatic_1
-        T_putstatic_14 t = new T_putstatic_14();
-        assertEquals(0, T_putstatic_14.getProtectedField());
-        t.run();
-        assertEquals(1000000, T_putstatic_14.getProtectedField());
-    }
-
-    /**
-     * @title  assignment compatible references
-     */
-    public void testN5() {
-        T_putstatic_16 t = new T_putstatic_16();
-        assertNull(T_putstatic_16.o);
-        t.run();
-        assertEquals("", (String) T_putstatic_16.o);
-    }
-
-    /**
-     * @title  attempt to set non-static field
-     */
-    public void testE1() {
-        try {
-            T_putstatic_7 t = new T_putstatic_7();
-            t.run();
-            fail("expected IncompatibleClassChangeError");
-        } catch (IncompatibleClassChangeError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  modification of non-accessible field
-     */
-    public void testE2() {
-        // @uses dxc.junit.opcodes.putstatic.TestStubs
-        try {
-            T_putstatic_8 t = new T_putstatic_8();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NoClassDefFoundError
-     */
-    public void testE3() {
-        try {
-            T_putstatic_9 t = new T_putstatic_9();
-            t.run();
-            fail("expected NoClassDefFoundError");
-        } catch (NoClassDefFoundError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title expected NoSuchFieldError
-     */
-    public void testE4() {
-        try {
-            T_putstatic_10 t = new T_putstatic_10();
-            t.run();
-            fail("expected NoSuchFieldError");
-        } catch (NoSuchFieldError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  Modification of final field in other class
-     */
-    public void testE5() {
-        // @uses dxc.junit.opcodes.putstatic.TestStubs
-        try {
-            T_putstatic_11 t = new T_putstatic_11();
-            t.run();
-            fail("expected IllegalAccessError");
-        } catch (IllegalAccessError iae) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @title  initialization of referenced class throws exception
-     */
-    public void testE6() {
-        // @uses dxc.junit.opcodes.putstatic.jm.StubInitError
-        T_putstatic_13 t = new T_putstatic_13();
-        try {
-            t.run();
-            fail("expected Error");
-        } catch (Error e) {
-            // expected
-        }
-    }
-
-    //  FIXME: "fail" commented out temporarily - check
-    /**
-     * @title  modification of superclass' private field from subclass
-     * FIXME: is this a bug in JVM?
-     */
-    public void testE7() {
-        // @uses dxc.junit.opcodes.putstatic.jm.T_putstatic_1
-        try {
-            assertEquals(0, T_putstatic_15.getPvtField());
-            T_putstatic_15 t = new T_putstatic_15();
-            t.run();
-            assertEquals(12321, T_putstatic_15.getPvtField());
-            //fail("expected IllegalAccessError");
-        } catch (IllegalAccessError e) {
-            // expected
-        } catch (VerifyError vfe) { 
-            // ok for dalvikvm; 
-            System.out.print("dvmvfe:"); 
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.12
-     * @title constant pool index
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.putstatic.jm.T_putstatic_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.putstatic.jm.T_putstatic_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.17
-     * @title type of argument - float instead of
-     * int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.putstatic.jm.T_putstatic_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.17
-     * @title type of argument - assignment
-     * incompatible references
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.putstatic.jm.T_putstatic_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.17
-     * @title type of argument - assignment
-     * incompatible values
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.putstatic.jm.T_putstatic_18");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-    /**
-     * @constraint 4.8.1.12
-     * @title constant pool type
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.putstatic.jm.T_putstatic_17");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_1.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_1.j
deleted file mode 100644
index b1a57ba..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_1.j
+++ /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_putstatic_1.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_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
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_1.st_i1 I
-    return
-.end method
-
-.method public static getPvtField()I
-   getstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_1.st_pvt1 I
-   ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_1.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_1.java
deleted file mode 100644
index 4876ea0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_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/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_10.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_10.j
deleted file mode 100644
index 6ffd777..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_10.j
+++ /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 T_putstatic_10.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_10
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_10.st_i1N I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_10.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_10.java
deleted file mode 100644
index c1a6d75..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_10.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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_10 {
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_11.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_11.j
deleted file mode 100644
index c60bb18..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_11.j
+++ /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_putstatic_11.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_11
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.TestStubs.TestStubFieldFinal I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_11.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_11.java
deleted file mode 100644
index 6231867..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_11 {
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_12.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_12.j
deleted file mode 100644
index 044864b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_12.j
+++ /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 T_putstatic_12.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_12
-.super java/lang/Object
-
-.field public final static st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_12.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_12.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_12.java
deleted file mode 100644
index 1261528..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_12 {
-    public static int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_13.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_13.j
deleted file mode 100644
index 5216b3f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_13.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_putstatic_13.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_13
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()I
-    .limit stack 1
-    .limit locals 1
-
-    getstatic dxc.junit.opcodes.putstatic.jm.StubInitError.value I
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_13.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_13.java
deleted file mode 100644
index 16afdc1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_13 {
-    
-    public int run() {
-        return StubInitError.value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_14.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_14.j
deleted file mode 100644
index c781c03..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_14.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_putstatic_14.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_14
-.super dxc/junit/opcodes/putstatic/jm/T_putstatic_1
-
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/putstatic/jm/T_putstatic_1/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_1.st_p1 I
-    return
-.end method
-
-.method public static getProtectedField()I
-   getstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_1.st_p1 I
-   ireturn
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_14.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_14.java
deleted file mode 100644
index 80296f9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_14 extends T_putstatic_1{
-    
-    public void run() {
-        T_putstatic_1.st_p1 = 1000000;
-    }
-    
-    public static int getProtectedField(){
-        return T_putstatic_1.st_p1;
-    }
-    
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_15.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_15.j
deleted file mode 100644
index 44e8785..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_15.j
+++ /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_putstatic_15.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_15
-.super dxc/junit/opcodes/putstatic/jm/T_putstatic_1
-
-.method public <init>()V
-    aload_0
-    invokespecial dxc/junit/opcodes/putstatic/jm/T_putstatic_1/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 12321
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_1.st_pvt1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_15.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_15.java
deleted file mode 100644
index b2f4dae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_15.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_15 extends T_putstatic_1{
-    
-    public void run() {
-        //
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_16.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_16.j
deleted file mode 100644
index 6b1d154..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_16.j
+++ /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_putstatic_16.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_16
-.super java/lang/Object
-
-.field public static o Ljava/lang/Object;
-
-.method static <clinit>()V
-    .limit stack 1
-    .limit locals 0
-
-    aconst_null
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_16.o Ljava/lang/Object;
-
-    return
-.end method
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 3
-    .limit locals 2
-
-    new java/lang/String
-    dup
-    ldc ""
-    invokespecial java/lang/String/<init>(Ljava/lang/String;)V
-
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_16.o Ljava/lang/Object;
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_16.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_16.java
deleted file mode 100644
index b0d5d14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_16.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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_16 {
-
-    public static Object o = null;
-    
-    public void run() {
-        String s = new String("");
-        o = s;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_17.cfh b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_17.cfh
deleted file mode 100644
index e5e2de3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_17.cfh
+++ /dev/null
@@ -1,213 +0,0 @@
-//@class:dxc/junit/opcodes/putstatic/jm/T_putstatic_17
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 11 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 5, h: 0003: int{0x000f4240 / 1000000}
-    // .  .  .  B  @  
-       03 00 0f 42 40 
-    // parsed:, offset 39, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 52, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 61, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 67, len 22, h: 0007: utf8{"T_putstatic_17.java"}
-    // .  .  .  T  _  p  u  t  s  t  a  t  i  c  _  1  7  .  j  a  v  a  
-       01 00 13 54 5f 70 75 74 73 74 61 74 69 63 5f 31 37 2e 6a 61 76 61 
-    // parsed:, offset 89, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 94, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 101, len 48, h: 000a: utf8{"dxc/junit/opcodes/putstatic/jm/T_putstatic_17"}
-    // .  .  -  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  p  u  t  s  t  a  t  i  c  /  j  m  /  T  _  p  u  t  s  t  a  t  i  c  _  1  7  
-       01 00 2d 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 70 75 74 73 74 61 74 69 63 2f 6a 6d 2f 54 5f 70 75 74 73 74 61 74 69 63 5f 31 37 
-    // parsed:, offset 149, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 155, len 8, h: 000c: utf8{"st_i1"}
-    // .  .  .  s  t  _  i  1  
-       01 00 05 73 74 5f 69 31 
-    // parsed:, offset 163, len 4, h: 000d: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 167, len 3, h: 000e: type{dxc.junit.opcodes.putstatic.jm.T_putstatic_17}
-    // .  .  .  
-       07 00 0a 
-    // parsed:, offset 170, len 5, h: 000f: nat{st_i1:I}
-    // .  .  .  .  .  
-       0c 00 0c 00 0d 
-    // parsed:, offset 175, len 5, h: 0010: field{dxc.junit.opcodes.putstatic.jm.T_putstatic_17.st_i1:I}
-    // .  .  .  .  .  
-       09 00 0e 00 0f 
-    // parsed:, offset 180, len 3, h: 0011: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 183, len 0, h: end constant_pool
-// parsed:, offset 183, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 185, len 2, h: this_class: type{dxc.junit.opcodes.putstatic.jm.T_putstatic_17}
-// .  .  
-   00 0e 
-// parsed:, offset 187, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 11 
-// parsed:, offset 189, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 191, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:st_i1, offset 193, len:83,desc: I
-// parsed:, offset 193, len 0, h:  fields[0]: 
-    // parsed:, offset 193, len 2, h: access_flags: public|static
-    // .  .  
-       00 09 
-    // parsed:, offset 195, len 2, h: name: st_i1
-    // .  .  
-       00 0c 
-    // parsed:, offset 197, len 2, h: descriptor: I
-    // .  .  
-       00 0d 
-    // parsed:, offset 199, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 201, len 0, h: end fields[0] 
-// ========== end-ParseMember:st_i1, desc: I
-// parsed:, offset 201, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 203, len:73,desc: ()V
-// parsed:, offset 203, len 0, h:  methods[0]: 
-    // parsed:, offset 203, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 205, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 207, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 209, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 211, len 0, h:  attributes[0]: 
-        // parsed:, offset 211, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 213, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 217, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 219, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 221, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 230, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 232, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 234, len 0, h: end attributes[0] 
-// parsed:, offset 234, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 234, len:42,desc: ()V
-// parsed:, offset 234, len 0, h:  methods[1]: 
-    // parsed:, offset 234, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 236, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 238, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 240, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 242, len 0, h:  attributes[0]: 
-        // parsed:, offset 242, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 244, len 4, h: length: 00000012
-        // .  .  .  .  
-           00 00 00 12 
-        // parsed:, offset 248, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 250, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 252, len 4, h: code_length: 00000006
-        // .  .  .  .  
-           00 00 00 06 
-        // parsed:, offset 0, len 2, h: 0000: ldc #+000f4240
-        // .  .  
-           12 03 
-        // parsed:, offset 2, len 3, h: 0002: putstatic field{dxc.junit.opcodes.putstatic.jm.T_putstatic_17.st_i1:I}
-        // .  .  .  
-//@mod           b3 00 10 
-           b3 00 03 
-        // parsed:, offset 5, len 1, h: 0005: return
-        // .  
-           b1 
-        // parsed:, offset 262, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 264, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 266, len 0, h: end attributes[0] 
-// parsed:, offset 266, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 266, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 268, len 0, h:  attributes[0]: 
-    // parsed:, offset 268, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 270, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 274, len 2, h: source: utf8{"T_putstatic_17.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 276, len 0, h: end attributes[0] 
-// parsed:, offset 276, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_17.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_17.j
deleted file mode 100644
index 18b3e14..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_17.j
+++ /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 T_putstatic_17.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_17
-.super java/lang/Object
-
-.field public static st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_17.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_17.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_17.java
deleted file mode 100644
index 28056a7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_17.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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_17 {
-
-    public static int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_18.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_18.j
deleted file mode 100644
index 83d518a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_18.j
+++ /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_putstatic_18.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_18
-.super java/lang/Object
-
-.field public static v I
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    ldc 3.14
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_18.v I
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_18.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_18.java
deleted file mode 100644
index 5293bcf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_18.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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_18 {
-
-    public static int v;
-    
-    public void run() {
-        v = (int)3.14f;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_2.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_2.j
deleted file mode 100644
index 2b2ca2c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_2.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_putstatic_2.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_2
-.super java/lang/Object
-
-.field public static st_d1 D
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit stack 2
-    ldc2_w 1000000.0
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_2.st_d1 D
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_2.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_2.java
deleted file mode 100644
index eb40d35..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_2 {
-
-    public static double st_d1;
-    
-    public void run() {
-        st_d1 = 1000000d;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_3.cfh b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_3.cfh
deleted file mode 100644
index e200a7c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_3.cfh
+++ /dev/null
@@ -1,213 +0,0 @@
-//@class:dxc/junit/opcodes/putstatic/jm/T_putstatic_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 0012
-// .  .  
-   00 12 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0f 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 21, h: 0005: utf8{"T_putstatic_3.java"}
-    // .  .  .  T  _  p  u  t  s  t  a  t  i  c  _  3  .  j  a  v  a  
-       01 00 12 54 5f 70 75 74 73 74 61 74 69 63 5f 33 2e 6a 61 76 61 
-    // parsed:, offset 77, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 83, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0c 
-    // parsed:, offset 88, len 47, h: 0008: utf8{"dxc/junit/opcodes/putstatic/jm/T_putstatic_3"}
-    // .  .  ,  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  p  u  t  s  t  a  t  i  c  /  j  m  /  T  _  p  u  t  s  t  a  t  i  c  _  3  
-       01 00 2c 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 70 75 74 73 74 61 74 69 63 2f 6a 6d 2f 54 5f 70 75 74 73 74 61 74 69 63 5f 33 
-    // parsed:, offset 135, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 142, len 5, h: 000a: int{0x000f4240 / 1000000}
-    // .  .  .  B  @  
-       03 00 0f 42 40 
-    // parsed:, offset 147, len 3, h: 000b: type{dxc.junit.opcodes.putstatic.jm.T_putstatic_3}
-    // .  .  .  
-       07 00 08 
-    // parsed:, offset 150, len 6, h: 000c: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 156, len 8, h: 000d: utf8{"st_i1"}
-    // .  .  .  s  t  _  i  1  
-       01 00 05 73 74 5f 69 31 
-    // parsed:, offset 164, len 5, h: 000e: nat{st_i1:I}
-    // .  .  .  .  .  
-       0c 00 0d 00 10 
-    // parsed:, offset 169, len 3, h: 000f: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 172, len 4, h: 0010: utf8{"I"}
-    // .  .  .  I  
-       01 00 01 49 
-    // parsed:, offset 176, len 5, h: 0011: field{dxc.junit.opcodes.putstatic.jm.T_putstatic_3.st_i1:I}
-    // .  .  .  .  .  
-       09 00 0b 00 0e 
-// parsed:, offset 181, len 0, h: end constant_pool
-// parsed:, offset 181, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 183, len 2, h: this_class: type{dxc.junit.opcodes.putstatic.jm.T_putstatic_3}
-// .  .  
-   00 0b 
-// parsed:, offset 185, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0f 
-// parsed:, offset 187, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 189, len 2, h: fields_count: 0001
-// .  .  
-   00 01 
-// ========== start-ParseMember:st_i1, offset 191, len:83,desc: I
-// parsed:, offset 191, len 0, h:  fields[0]: 
-    // parsed:, offset 191, len 2, h: access_flags: public|static
-    // .  .  
-       00 09 
-    // parsed:, offset 193, len 2, h: name: st_i1
-    // .  .  
-       00 0d 
-    // parsed:, offset 195, len 2, h: descriptor: I
-    // .  .  
-       00 10 
-    // parsed:, offset 197, len 2, h: attributes_count: 0000
-    // .  .  
-       00 00 
-// parsed:, offset 199, len 0, h: end fields[0] 
-// ========== end-ParseMember:st_i1, desc: I
-// parsed:, offset 199, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 201, len:73,desc: ()V
-// parsed:, offset 201, len 0, h:  methods[0]: 
-    // parsed:, offset 201, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 203, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 205, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 207, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 209, len 0, h:  attributes[0]: 
-        // parsed:, offset 209, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 211, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 215, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 217, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 219, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 228, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 230, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 232, len 0, h: end attributes[0] 
-// parsed:, offset 232, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 232, len:42,desc: ()V
-// parsed:, offset 232, len 0, h:  methods[1]: 
-    // parsed:, offset 232, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 234, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 236, len 2, h: descriptor: ()V
-    // .  .  
-       00 0c 
-    // parsed:, offset 238, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 240, len 0, h:  attributes[0]: 
-        // parsed:, offset 240, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 242, len 4, h: length: 00000012
-        // .  .  .  .  
-           00 00 00 12 
-        // parsed:, offset 246, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 248, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 250, len 4, h: code_length: 00000006
-        // .  .  .  .  
-           00 00 00 06 
-        // parsed:, offset 0, len 2, h: 0000: ldc #+000f4240
-        // .  .  
-           12 0a 
-        // parsed:, offset 2, len 3, h: 0002: putstatic field{dxc.junit.opcodes.putstatic.jm.T_putstatic_3.st_i1:I}
-        // .  .  .  
-//@mod           b3 00 11 
-           b3 01 11 
-        // parsed:, offset 5, len 1, h: 0005: return
-        // .  
-           b1 
-        // parsed:, offset 260, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 262, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 264, len 0, h: end attributes[0] 
-// parsed:, offset 264, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 264, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 266, len 0, h:  attributes[0]: 
-    // parsed:, offset 266, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 268, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 272, len 2, h: source: utf8{"T_putstatic_3.java"}
-    // .  .  
-       00 05 
-// parsed:, offset 274, len 0, h: end attributes[0] 
-// parsed:, offset 274, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_3.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_3.j
deleted file mode 100644
index b72a7b0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_3.j
+++ /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 T_putstatic_3.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_3
-.super java/lang/Object
-
-.field public static st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_3.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_3.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_3.java
deleted file mode 100644
index 1ec204e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_3 {
-
-    public static int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_4.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_4.j
deleted file mode 100644
index 24fa5aa..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_4.j
+++ /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 T_putstatic_4.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_4
-.super java/lang/Object
-
-.field public static st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-;    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_4.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_4.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_4.java
deleted file mode 100644
index f3c016a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_4 {
-
-    public static int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_5.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_5.j
deleted file mode 100644
index f8cb68d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_5.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_putstatic_5.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_5
-.super java/lang/Object
-
-.field public static st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-;    ldc 1000000
-    fconst_1
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_5.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_5.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_5.java
deleted file mode 100644
index de12995..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_5 {
-
-    public static int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_6.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_6.j
deleted file mode 100644
index baef85a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_6.j
+++ /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_putstatic_6.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_6
-.super java/lang/Object
-
-.field public static s Ljava/lang/String;
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 2
-
-    new java/lang/Object
-    dup
-    invokespecial java/lang/Object/<init>()V
-
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_6.s Ljava/lang/String;
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_6.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_6.java
deleted file mode 100644
index 1a625d6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_6.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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_6 {
-
-    public static String s;
-    
-    public void run() {
-        Object o = new Object();
-        s = (String)o;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_7.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_7.j
deleted file mode 100644
index 806105a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_7.j
+++ /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 T_putstatic_7.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_7
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_7.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_7.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_7.java
deleted file mode 100644
index 9fec90d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_7 {
-    public static int st_i1;
-    
-    public void run() {
-        st_i1 = 1000000;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_8.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_8.j
deleted file mode 100644
index acab0d1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_8.j
+++ /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_putstatic_8.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.TestStub.TestStubField I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_8.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_8.java
deleted file mode 100644
index c78048a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_8 {
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_9.j b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_9.j
deleted file mode 100644
index 2a82450..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_9.j
+++ /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 T_putstatic_9.java
-.class public dxc/junit/opcodes/putstatic/jm/T_putstatic_9
-.super java/lang/Object
-
-.field public st_i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    ldc 1000000
-    putstatic dxc.junit.opcodes.putstatic.jm.T_putstatic_91.st_i1 I
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_9.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_9.java
deleted file mode 100644
index 9defac3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/T_putstatic_9.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 dxc.junit.opcodes.putstatic.jm;
-
-public class T_putstatic_9 {
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/TestStubs.java b/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/TestStubs.java
deleted file mode 100644
index 9cc2aa6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/putstatic/jm/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 dxc.junit.opcodes.putstatic.jm;
-
-
-class StubInitError{
-    public static int value = 5 / 0;
-}
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/Test_ret.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/Test_ret.java
deleted file mode 100644
index a8b43ae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/Test_ret.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 dxc.junit.opcodes.ret;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.ret.jm.T_ret_1;
-import dxc.junit.opcodes.ret.jm.T_ret_1_w;
-
-public class Test_ret extends DxTestCase {
-
-    /**
-     * NORMAL RET VERSION
-     */
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_ret_1 t = new T_ret_1();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.21
-     * @title index operand
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.ret.jm.T_ret_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title variable referenced by index shall
-     * contain returnAddress
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.ret.jm.T_ret_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.24
-     * @title each returnAddress can be returned only
-     * once
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.ret.jm.T_ret_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.22
-     * @title single ret instruction
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.ret.jm.T_ret_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * WIDE RET VERSION
-     */
-
-    /**
-     * @title 
-     */
-    public void testN2() {
-        T_ret_1_w t = new T_ret_1_w();
-        assertTrue(t.run());
-    }
-
-    /**
-     * @constraint 4.8.1.21
-     * @title index operand
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.ret.jm.T_ret_2_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title variable referenced by index shall
-     * contain returnAddress
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.ret.jm.T_ret_3_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.24
-     * @title each returnAddress can be returned only
-     * once
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.ret.jm.T_ret_4_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.22
-     * @title single ret instruction
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.ret.jm.T_ret_5_w");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1.j b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1.j
deleted file mode 100644
index f73f634..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1.j
+++ /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_ret_1.java
-.class public dxc/junit/opcodes/ret/jm/T_ret_1
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    jsr SetField
-
-    aload_0
-    getfield dxc.junit.opcodes.ret.jm.T_ret_1.i1 I
-    sipush 1000
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore_1
-    aload_0
-    sipush 1000
-    putfield dxc.junit.opcodes.ret.jm.T_ret_1.i1 I
-    ret 1
-; test that ret returns immediately
-    aload_0
-    sipush 2000
-    putfield dxc.junit.opcodes.ret.jm.T_ret_1.i1 I
-    ret 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1.java
deleted file mode 100644
index e0ee60c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1.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 dxc.junit.opcodes.ret.jm;
-
-public class T_ret_1 {
-
-    public int i1;
-    
-    private void setfield() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1_w.j b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1_w.j
deleted file mode 100644
index fd91e23..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1_w.j
+++ /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_ret_1_w.java
-.class public dxc/junit/opcodes/ret/jm/T_ret_1_w
-.super java/lang/Object
-
-.field public i1 I
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 300
-    
-    jsr_w SetField
-
-    aload_0
-    getfield dxc.junit.opcodes.ret.jm.T_ret_1_w.i1 I
-    sipush 1000
-    if_icmpne Label0
-    
-    iconst_1
-    ireturn
-    
-Label0:
-    iconst_0    
-    ireturn
-
-SetField:
-    astore 270
-    aload_0
-    sipush 1000
-    putfield dxc.junit.opcodes.ret.jm.T_ret_1_w.i1 I
-    ret_w 270
-; test that ret returns immediately
-    aload_0
-    sipush 2000
-    putfield dxc.junit.opcodes.ret.jm.T_ret_1_w.i1 I
-    ret_w 270
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1_w.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1_w.java
deleted file mode 100644
index 80d159a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_1_w.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 dxc.junit.opcodes.ret.jm;
-
-public class T_ret_1_w {
-
-    public int i1;
-    
-    private void setfield() {
-        i1 = 1000;
-    }
-    
-    public boolean run() {
-       setfield();
-       if(i1 == 1000)
-           return true;
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2.j b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2.j
deleted file mode 100644
index 5850796..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2.j
+++ /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_ret_2.java
-.class public dxc/junit/opcodes/ret/jm/T_ret_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 2
-    
-    jsr SetField
-
-    iconst_0
-    ireturn
-    
-SetField:
-    astore_1
-    ret 10
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2.java
deleted file mode 100644
index 48719f3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_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 dxc.junit.opcodes.ret.jm;
-
-public class T_ret_2 {
-
-    private void setfield() {
-    }
-    
-    public boolean run() {
-       setfield();
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2_w.j b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2_w.j
deleted file mode 100644
index c6ecab8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2_w.j
+++ /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_ret_2_w.java
-.class public dxc/junit/opcodes/ret/jm/T_ret_2_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 300
-    
-    jsr_w SetField
-
-    iconst_0
-    ireturn
-    
-SetField:
-    astore 269
-    ret_w 300
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2_w.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2_w.java
deleted file mode 100644
index a10ec49..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_2_w.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 dxc.junit.opcodes.ret.jm;
-
-public class T_ret_2_w {
-
-    private void setfield() {
-    }
-    
-    public boolean run() {
-       setfield();
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3.j b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3.j
deleted file mode 100644
index 1016b02..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3.j
+++ /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_ret_3.java
-.class public dxc/junit/opcodes/ret/jm/T_ret_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 3
-    
-    jsr SetField
-
-    iconst_0
-    ireturn
-    
-SetField:
-    astore_2
-    aload_0
-    astore_1
-    ret 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3.java
deleted file mode 100644
index 106f930..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3.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 dxc.junit.opcodes.ret.jm;
-
-public class T_ret_3 {
-
-    private void setfield() {
-    }
-    
-    public boolean run() {
-       setfield();
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3_w.j b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3_w.j
deleted file mode 100644
index dba7682..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3_w.j
+++ /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_ret_3_w.java
-.class public dxc/junit/opcodes/ret/jm/T_ret_3_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit stack 2
-    .limit locals 3
-    
-    jsr_w SetField
-
-    iconst_0
-    ireturn
-    
-SetField:
-    astore_2
-    aload_0
-    astore_1
-    ret_w 1
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3_w.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3_w.java
deleted file mode 100644
index 5c20726..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_3_w.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 dxc.junit.opcodes.ret.jm;
-
-public class T_ret_3_w {
-
-    private void setfield() {
-    }
-    
-    public boolean run() {
-       setfield();
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4.j b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4.j
deleted file mode 100644
index 8c72c1a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4.j
+++ /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_ret_4.java
-.class public dxc/junit/opcodes/ret/jm/T_ret_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit locals 5
-    .limit stack 5
-
-    goto Label1
-    
-Label3:
-    astore_1    
-    ret 1
-    
-Label2:
-    astore_1
-    jsr Label3
-    ret 1    
-    
-Label1:    
-    jsr Label2
-    
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4.java
deleted file mode 100644
index 96f1924..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4.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 dxc.junit.opcodes.ret.jm;
-
-public class T_ret_4 {
-
-    private void f2() {
-    }
-    
-    private void f1() {
-        f2();
-    }
-    
-    public boolean run() {
-       f1();
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4_w.j b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4_w.j
deleted file mode 100644
index 3cddbb8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4_w.j
+++ /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_ret_4_w.java
-.class public dxc/junit/opcodes/ret/jm/T_ret_4_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()Z
-    .limit locals 5
-    .limit stack 5
-
-    goto Label1
-    
-Label3:
-    astore_1    
-    ret_w 1
-    
-Label2:
-    astore_1
-    jsr_w Label3
-    ret_w 1    
-    
-Label1:    
-    jsr_w Label2
-    
-    iconst_0
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4_w.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4_w.java
deleted file mode 100644
index d27e9d3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_4_w.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 dxc.junit.opcodes.ret.jm;
-
-public class T_ret_4_w {
-
-    private void f2() {
-    }
-    
-    private void f1() {
-        f2();
-    }
-    
-    public boolean run() {
-       f1();
-       return false;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5.j b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5.j
deleted file mode 100644
index d0eb53b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5.j
+++ /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_ret_5.java
-.class public dxc/junit/opcodes/ret/jm/T_ret_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit locals 5
-    .limit stack 5
-
-    iconst_1
-    istore_2
-
-    jsr Label3
-
-    return
-    
-Label3:
-    astore_1    
-    
-    iload_2
-    iconst_0
-    if_icmpeq Label1
-    ret 1
-Label1:
-    ret 1    
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5.java
deleted file mode 100644
index 60d0014..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5.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 dxc.junit.opcodes.ret.jm;
-
-public class T_ret_5 {
-
-    private void setfield() {
-    }
-    
-    public void run() {
-       setfield();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5_w.j b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5_w.j
deleted file mode 100644
index b049cae..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5_w.j
+++ /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_ret_5_w.java
-.class public dxc/junit/opcodes/ret/jm/T_ret_5_w
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()V
-    .limit locals 5
-    .limit stack 5
-
-    iconst_1
-    istore_2
-
-    jsr_w Label3
-
-    return
-    
-Label3:
-    astore_1    
-    
-    iload_2
-    iconst_0
-    if_icmpeq Label1
-    ret_w 1
-Label1:
-    ret_w 1    
-    
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5_w.java b/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5_w.java
deleted file mode 100644
index dfc10c6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/ret/jm/T_ret_5_w.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 dxc.junit.opcodes.ret.jm;
-
-public class T_ret_5_w {
-
-    private void setfield() {
-    }
-    
-    public void run() {
-       setfield();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/Test_saload.java b/tools/dx-tests/src/dxc/junit/opcodes/saload/Test_saload.java
deleted file mode 100644
index 435a117..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/Test_saload.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 dxc.junit.opcodes.saload;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.saload.jm.T_saload_1;
-
-public class Test_saload extends DxTestCase {
-
-    /**
-     * @title normal test. trying different indexes 
-     */
-    public void testN1() {
-        T_saload_1 t = new T_saload_1();
-        short[] arr = new short[2];
-        arr[1] = 10000;
-        assertEquals(10000, t.run(arr, 1));
-    }
-
-    /**
-     * @title normal test. trying different indexes
-     */
-    public void testN2() {
-        T_saload_1 t = new T_saload_1();
-        short[] arr = new short[2];
-        arr[0] = 10000;
-        assertEquals(10000, t.run(arr, 0));
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_saload_1 t = new T_saload_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_saload_1 t = new T_saload_1();
-        try {
-            t.run(null, 2);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_saload_1 t = new T_saload_1();
-        short[] arr = new short[2];
-        try {
-            t.run(arr, -1);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.saload.jm.T_saload_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.saload.jm.T_saload_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.saload.jm.T_saload_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.saload.jm.T_saload_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - Object, int
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.saload.jm.T_saload_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.saload.jm.T_saload_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - int[], int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.saload.jm.T_saload_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.saload.jm.T_saload_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_1.j b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_1.j
deleted file mode 100644
index 180c180..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_1.j
+++ /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_saload_1.java
-.class public dxc/junit/opcodes/saload/jm/T_saload_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([SI)S
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-
-    saload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_1.java b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_1.java
deleted file mode 100644
index dd3083c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_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 dxc.junit.opcodes.saload.jm;
-
-public class T_saload_1 {
-    public short run(short[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_2.j b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_2.j
deleted file mode 100644
index f38e43a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_2.j
+++ /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_saload_2.java
-.class public dxc/junit/opcodes/saload/jm/T_saload_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([SI)S
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-;    iload_2
-
-    saload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_2.java b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_2.java
deleted file mode 100644
index bef1b9b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_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 dxc.junit.opcodes.saload.jm;
-
-public class T_saload_2 {
-
-    public short run(short[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_3.j b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_3.j
deleted file mode 100644
index aab2008..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_saload_3.java
-.class public dxc/junit/opcodes/saload/jm/T_saload_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([SI)S
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    saload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_3.java b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_3.java
deleted file mode 100644
index 4d2571c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_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 dxc.junit.opcodes.saload.jm;
-
-public class T_saload_3 {
-
-    public short run(short[] arr, int idx) {
-        return arr[idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_4.j b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_4.j
deleted file mode 100644
index 75cbfbf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_4.j
+++ /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_saload_4.java
-.class public dxc/junit/opcodes/saload/jm/T_saload_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([SD)S
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-;    d2i
-    saload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_4.java b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_4.java
deleted file mode 100644
index c482474..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_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 dxc.junit.opcodes.saload.jm;
-
-public class T_saload_4 {
-
-    public short run(short[] arr, double idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_5.j b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_5.j
deleted file mode 100644
index f528968..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_5.j
+++ /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_saload_5.java
-.class public dxc/junit/opcodes/saload/jm/T_saload_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([SJ)S
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    lload_2
-    saload
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_5.java b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_5.java
deleted file mode 100644
index 4f95b0d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_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 dxc.junit.opcodes.saload.jm;
-
-public class T_saload_5 {
-
-    public short run(short[] arr, long idx) {
-        return arr[(int)idx];
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_6.j b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_6.j
deleted file mode 100644
index 9682e21..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_6.j
+++ /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_saload_6.java
-.class public dxc/junit/opcodes/saload/jm/T_saload_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;[SI)S
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-
-    saload
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_6.java b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_6.java
deleted file mode 100644
index 1c1cf0d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_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 dxc.junit.opcodes.saload.jm;
-
-public class T_saload_6 {
-
-    public short run(Object a, short[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_7.j b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_7.j
deleted file mode 100644
index fac34c8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_7.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_saload_7.java
-.class public dxc/junit/opcodes/saload/jm/T_saload_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([D[SI)S
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    saload
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_7.java b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_7.java
deleted file mode 100644
index 5036d22..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_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 dxc.junit.opcodes.saload.jm;
-
-public class T_saload_7 {
-
-    public short run(double[] a, short[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_8.j b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_8.j
deleted file mode 100644
index f5d15da..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_8.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_saload_8.java
-.class public dxc/junit/opcodes/saload/jm/T_saload_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run([I[SI)S
-    .limit stack 2
-    .limit locals 4
-    aload_1
-    iload_3
-    saload
-
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_8.java b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_8.java
deleted file mode 100644
index 77bc620..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_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 dxc.junit.opcodes.saload.jm;
-
-public class T_saload_8 {
-
-    public short run(int[] a, short[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_9.j b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_9.j
deleted file mode 100644
index af1e40d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_9.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_saload_9.java
-.class public dxc/junit/opcodes/saload/jm/T_saload_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([SI)S
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-    aload_0
-    saload
-    ireturn
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_9.java b/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_9.java
deleted file mode 100644
index 05b3f3e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/saload/jm/T_saload_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 dxc.junit.opcodes.saload.jm;
-
-public class T_saload_9 {
-    
-    public short run(short[] arr, int idx) {
-        return arr[idx];
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/Test_sastore.java b/tools/dx-tests/src/dxc/junit/opcodes/sastore/Test_sastore.java
deleted file mode 100644
index f4127c4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/Test_sastore.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 dxc.junit.opcodes.sastore;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.sastore.jm.T_sastore_1;
-
-public class Test_sastore extends DxTestCase {
-
-    /**
-     * @title normal test. trying different indexes 
-     */
-    public void testN1() {
-        T_sastore_1 t = new T_sastore_1();
-        short[] arr = new short[2];
-        t.run(arr, 1, (short) 10000);
-        assertEquals(10000, arr[1]);
-    }
-
-    /**
-     * @title normal test. trying different indexes 
-     */
-    public void testN2() {
-        T_sastore_1 t = new T_sastore_1();
-        short[] arr = new short[2];
-        t.run(arr, 0, (short) 10000);
-        assertEquals(10000, arr[0]);
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE1() {
-        T_sastore_1 t = new T_sastore_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_sastore_1 t = new T_sastore_1();
-        try {
-            t.run(null, 2, (short) 10000);
-            fail("expected NullPointerException");
-        } catch (NullPointerException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @title expected ArrayIndexOutOfBoundsException
-     */
-    public void testE3() {
-        T_sastore_1 t = new T_sastore_1();
-        short[] arr = new short[2];
-        try {
-            t.run(arr, -1, (short) 10000);
-            fail("expected ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException aie) {
-            // expected
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.sastore.jm.T_sastore_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.sastore.jm.T_sastore_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, double,
-     * int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.sastore.jm.T_sastore_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, int, long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.sastore.jm.T_sastore_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - object, int, int
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.sastore.jm.T_sastore_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double[], int,
-     * int
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.sastore.jm.T_sastore_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long[], int, int
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.sastore.jm.T_sastore_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - array, reference,
-     * int
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.sastore.jm.T_sastore_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_1.j b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_1.j
deleted file mode 100644
index 239c519..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_1.j
+++ /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_sastore_1.java
-.class public dxc/junit/opcodes/sastore/jm/T_sastore_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([SIS)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    iload_3
-    sastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_1.java b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_1.java
deleted file mode 100644
index d55f755..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_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 dxc.junit.opcodes.sastore.jm;
-
-public class T_sastore_1 {
-    public void run(short[] arr, int idx, short value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_2.j b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_2.j
deleted file mode 100644
index d72eb80..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_2.j
+++ /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_sastore_2.java
-.class public dxc/junit/opcodes/sastore/jm/T_sastore_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([SIS)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    ;iload_3
-    sastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_2.java b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_2.java
deleted file mode 100644
index 5072930..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_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 dxc.junit.opcodes.sastore.jm;
-
-public class T_sastore_2 {
-
-    public void run(short[] arr, int idx, short value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_3.j b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_3.j
deleted file mode 100644
index 19c93e3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_3.j
+++ /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_sastore_3.java
-.class public dxc/junit/opcodes/sastore/jm/T_sastore_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([SIS)V
-    .limit stack 3
-    .limit locals 4
-
-    ;aload_1
-    iload_2
-    iload_3
-    sastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_3.java b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_3.java
deleted file mode 100644
index 9417fff..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_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 dxc.junit.opcodes.sastore.jm;
-
-public class T_sastore_3 {
-
-    public void run(short[] arr, int idx, short value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_4.j b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_4.j
deleted file mode 100644
index 2fd5a51..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_4.j
+++ /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_sastore_4.java
-.class public dxc/junit/opcodes/sastore/jm/T_sastore_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([SDI)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    dload_2
-;    d2i
-    iload 4
-    sastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_4.java b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_4.java
deleted file mode 100644
index 20e5619..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_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 dxc.junit.opcodes.sastore.jm;
-
-public class T_sastore_4 {
-
-    public void run(short[] arr, double idx, short value) {
-        arr[(int)idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_5.j b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_5.j
deleted file mode 100644
index 1c26fe8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_5.j
+++ /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_sastore_5.java
-.class public dxc/junit/opcodes/sastore/jm/T_sastore_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run([SIJ)V
-    .limit stack 4
-    .limit locals 5
-
-    aload_1
-    iload_2
-    lload 3
-;   l2i
-;    i2s    
-    sastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_5.java b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_5.java
deleted file mode 100644
index c235f95..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_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 dxc.junit.opcodes.sastore.jm;
-
-public class T_sastore_5 {
-
-    public void run(short[] arr, int idx, long value) {
-        arr[idx] = (short)value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_6.j b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_6.j
deleted file mode 100644
index e7ba17c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_6.j
+++ /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_sastore_6.java
-.class public dxc/junit/opcodes/sastore/jm/T_sastore_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(Ljava/lang/Object;IS)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    iload_2
-    iload_3
-    sastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_6.java b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_6.java
deleted file mode 100644
index 074ad48..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_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 dxc.junit.opcodes.sastore.jm;
-
-public class T_sastore_6 {
-
-    public void run(Object a, short[] arr, int idx, short value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_7.j b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_7.j
deleted file mode 100644
index b2a3f8a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_7.j
+++ /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_sastore_7.java
-.class public dxc/junit/opcodes/sastore/jm/T_sastore_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([D[SIS)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_3
-    iload 4
-    sastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_7.java b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_7.java
deleted file mode 100644
index 88d61cf..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_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 dxc.junit.opcodes.sastore.jm;
-
-public class T_sastore_7 {
-
-    public void run(double a[], short[] arr, int idx, short value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_8.j b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_8.j
deleted file mode 100644
index c6df01d..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_8.j
+++ /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_sastore_8.java
-.class public dxc/junit/opcodes/sastore/jm/T_sastore_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([J[SIS)V
-    .limit stack 3
-    .limit locals 5
-    
-    aload_1
-    iload_3
-    iload 4
-    sastore
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_8.java b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_8.java
deleted file mode 100644
index bce0b50..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_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 dxc.junit.opcodes.sastore.jm;
-
-public class T_sastore_8 {
-
-    public void run(long a[], short[] arr, int idx, short value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_9.j b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_9.j
deleted file mode 100644
index a0a551f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_9.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sastore_9.java
-.class public dxc/junit/opcodes/sastore/jm/T_sastore_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run([SIS)V
-    .limit stack 3
-    .limit locals 4
-
-    aload_1
-    aload_0
-    iload_3
-    sastore
-    return
-
-.end method
\ No newline at end of file
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_9.java b/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_9.java
deleted file mode 100644
index 444da12..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sastore/jm/T_sastore_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 dxc.junit.opcodes.sastore.jm;
-
-public class T_sastore_9 {
-    
-    public void run(short[] arr, int idx, short value) {
-        arr[idx] = value;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sipush/Test_sipush.java b/tools/dx-tests/src/dxc/junit/opcodes/sipush/Test_sipush.java
deleted file mode 100644
index 2f414c4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sipush/Test_sipush.java
+++ /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.
- */
-
-package dxc.junit.opcodes.sipush;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.sipush.jm.T_sipush_1;
-import dxc.junit.opcodes.sipush.jm.T_sipush_2;
-import dxc.junit.opcodes.sipush.jm.T_sipush_3;
-
-public class Test_sipush extends DxTestCase {
-
-    /**
-     * @title sipush -13570
-     */
-    public void testN1() {
-        T_sipush_1 t = new T_sipush_1();
-        assertEquals(-13570, t.run());
-    }
-
-    /**
-     * @title sipush 0
-     */
-    public void testB1() {
-        T_sipush_2 t = new T_sipush_2();
-        assertEquals(0, t.run());
-    }
-
-    /**
-     * @title sipush - 1
-     */
-    public void testB2() {
-        T_sipush_3 t = new T_sipush_3();
-        assertEquals(-1, t.run());
-    }
-
-    /**
-     * @constraint 4.8.2.5
-     * @title stack size
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.sipush.jm.T_sipush_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_1.j b/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_1.j
deleted file mode 100644
index 93b611e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_1.j
+++ /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_sipush_1.java
-.class public dxc/junit/opcodes/sipush/jm/T_sipush_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()S
-    sipush -13570
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_1.java b/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_1.java
deleted file mode 100644
index 32f714e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_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 dxc.junit.opcodes.sipush.jm;
-
-public class T_sipush_1 {
-
-    public short run() {
-        return (short)0xcafe;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_2.j b/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_2.j
deleted file mode 100644
index 590d92f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_2.j
+++ /dev/null
@@ -1,34 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_sipush_2.java
-.class public dxc/junit/opcodes/sipush/jm/T_sipush_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()S
-    .limit stack 1
-    .limit locals 1
-
-    sipush 0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_2.java b/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_2.java
deleted file mode 100644
index adab916..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_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 dxc.junit.opcodes.sipush.jm;
-
-public class T_sipush_2 {
-
-    public short run() {
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_3.j b/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_3.j
deleted file mode 100644
index 415c159..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_3.j
+++ /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_sipush_3.java
-.class public dxc/junit/opcodes/sipush/jm/T_sipush_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run()S
-    .limit stack 1
-    .limit locals 1
-
-    sipush -1
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_3.java b/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_3.java
deleted file mode 100644
index 81ff83be..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_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 dxc.junit.opcodes.sipush.jm;
-
-public class T_sipush_3 {
-
-    public short run() {
-        return -1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_4.j b/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_4.j
deleted file mode 100644
index f852a9a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_4.j
+++ /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_sipush_4.java
-.class public dxc/junit/opcodes/sipush/jm/T_sipush_4
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()S
-    .limit stack 1
-;    .limit locals 1
-
-    sipush 1
-    sipush 1
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_4.java b/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_4.java
deleted file mode 100644
index e3e540c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/sipush/jm/T_sipush_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 dxc.junit.opcodes.sipush.jm;
-
-public class T_sipush_4 {
-
-    public short run() {
-        return 1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/Test_swap.java b/tools/dx-tests/src/dxc/junit/opcodes/swap/Test_swap.java
deleted file mode 100644
index b7d8208..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/Test_swap.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.swap;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.swap.jm.T_swap_1;
-import dxc.junit.opcodes.swap.jm.T_swap_6;
-import dxc.junit.opcodes.swap.jm.T_swap_7;
-import dxc.junit.opcodes.swap.jm.T_swap_8;
-
-public class Test_swap extends DxTestCase {
-
-    /**
-     * @title  Integers
-     */
-    public void testN1() {
-        T_swap_1 t = new T_swap_1();
-        assertEquals(8, t.run(15, 8));
-    }
-
-    /**
-     * @title  Floats
-     */
-    public void testN2() {
-        T_swap_6 t = new T_swap_6();
-        assertEquals(8f, t.run(15f, 8f));
-    }
-
-    /**
-     * @title  References
-     */
-    public void testN3() {
-        T_swap_7 t = new T_swap_7();
-        int tmp[] = new int[1];
-        assertEquals(tmp, t.run(this, tmp));
-    }
-
-    /**
-     * @title  Reference & int
-     */
-    public void testN4() {
-        T_swap_8 t = new T_swap_8();
-        assertEquals(this, t.run(0xff, this));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.swap.jm.T_swap_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - double & int
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.swap.jm.T_swap_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long & int
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.swap.jm.T_swap_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title types of arguments - long & long
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.swap.jm.T_swap_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_1.j b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_1.j
deleted file mode 100644
index 42cb0cc..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_1.j
+++ /dev/null
@@ -1,32 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_swap_1.java
-.class public dxc/junit/opcodes/swap/jm/T_swap_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_2
-    iload_1
-    swap
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_1.java b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_1.java
deleted file mode 100644
index a662235..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_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 dxc.junit.opcodes.swap.jm;
-
-public class T_swap_1 {
-
-    public int run(int a, int b) {
-        return b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_2.j b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_2.j
deleted file mode 100644
index 77dca55..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_swap_2.java
-.class public dxc/junit/opcodes/swap/jm/T_swap_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run(II)I
-    .limit stack 2
-    .limit locals 3
-    iload_1
-;    iload_2
-    swap
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_2.java b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_2.java
deleted file mode 100644
index f9ee17f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_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 dxc.junit.opcodes.swap.jm;
-
-public class T_swap_2 {
-
-    public int run(int a, int b) {
-        return b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_3.j b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_3.j
deleted file mode 100644
index 3ea9627..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_3.j
+++ /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_swap_3.java
-.class public dxc/junit/opcodes/swap/jm/T_swap_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(DI)I
-    .limit stack 3
-    .limit locals 4
-
-    dload_1
-;    d2i
-    iload_3
-    swap
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_3.java b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_3.java
deleted file mode 100644
index 34278c5..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_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 dxc.junit.opcodes.swap.jm;
-
-public class T_swap_3 {
-
-    public int run(double a, int b) {
-        return b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_4.j b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_4.j
deleted file mode 100644
index 641c256..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_4.j
+++ /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_swap_4.java
-.class public dxc/junit/opcodes/swap/jm/T_swap_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(IJ)I
-    .limit stack 3
-    .limit locals 4
-
-    iload_1
-    lload_2
-    swap
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_4.java b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_4.java
deleted file mode 100644
index ffd75d6..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_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 dxc.junit.opcodes.swap.jm;
-
-public class T_swap_4 {
-
-    public int run(int a, long b) {
-        return (int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_5.j b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_5.j
deleted file mode 100644
index 53d03af..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_5.j
+++ /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_swap_5.java
-.class public dxc/junit/opcodes/swap/jm/T_swap_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(JJ)I
-    .limit stack 4
-    .limit locals 5
-
-    lload_1
-    lload_3
-    swap
-
-    iconst_0
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_5.java b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_5.java
deleted file mode 100644
index d684944..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_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 dxc.junit.opcodes.swap.jm;
-
-public class T_swap_5 {
-
-    public int run(int a, long b) {
-        return (int)b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_6.j b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_6.j
deleted file mode 100644
index 4b33952..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_6.j
+++ /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_swap_6.java
-.class public dxc/junit/opcodes/swap/jm/T_swap_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(FF)F
-    .limit stack 4
-    .limit locals 5
-
-    fload_2
-    fload_1
-    
-    swap
-
-    freturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_6.java b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_6.java
deleted file mode 100644
index c52c8d3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_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 dxc.junit.opcodes.swap.jm;
-
-public class T_swap_6 {
-
-    public float run(float a, float b) {
-        return b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_7.j b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_7.j
deleted file mode 100644
index 615a782..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_7.j
+++ /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_swap_7.java
-.class public dxc/junit/opcodes/swap/jm/T_swap_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-    .limit stack 4
-    .limit locals 5
-
-    aload_2
-    aload_1
-    
-    swap
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_7.java b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_7.java
deleted file mode 100644
index 789077e..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_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 dxc.junit.opcodes.swap.jm;
-
-public class T_swap_7 {
-
-    public Object run(Object a, Object b) {
-        return b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_8.j b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_8.j
deleted file mode 100644
index 81a647b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_8.j
+++ /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_swap_8.java
-.class public dxc/junit/opcodes/swap/jm/T_swap_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run(ILjava/lang/Object;)Ljava/lang/Object;
-    .limit stack 4
-    .limit locals 5
-
-    aload_2
-    iload_1
-    
-    swap
-
-    areturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_8.java b/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_8.java
deleted file mode 100644
index d4608bb..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/swap/jm/T_swap_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 dxc.junit.opcodes.swap.jm;
-
-public class T_swap_8 {
-
-    public Object run(int a, Object b) {
-        return b;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/Test_tableswitch.java b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/Test_tableswitch.java
deleted file mode 100644
index 459fb72..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/Test_tableswitch.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 dxc.junit.opcodes.tableswitch;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.opcodes.tableswitch.jm.T_tableswitch_1;
-
-public class Test_tableswitch extends DxTestCase {
-
-    /**
-     * @title normal test
-     */
-    public void testN1() {
-        T_tableswitch_1 t = new T_tableswitch_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 check Integer.MAX_VALUE
-     */
-    public void testB1() {
-        T_tableswitch_1 t = new T_tableswitch_1();
-        assertEquals(-1, t.run(Integer.MAX_VALUE));
-    }
-
-    /**
-     * @title check Integer.MIN_VALUE
-     */
-    public void testB2() {
-        T_tableswitch_1 t = new T_tableswitch_1();
-        assertEquals(-1, t.run(Integer.MIN_VALUE));
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title number of arguments
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.tableswitch.jm.T_tableswitch_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - float
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.tableswitch.jm.T_tableswitch_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.8
-     * @title branch target shall be inside the
-     * method
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.opcodes.tableswitch.jm.T_tableswitch_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.8
-     * @title branch target shall not be "inside" wide
-     * instruction
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.opcodes.tableswitch.jm.T_tableswitch_5");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.8
-     * @title low value shall be less than high
-     * value
-     */
-    public void testVFE5() {
-        try {
-            Class.forName("dxc.junit.opcodes.tableswitch.jm.T_tableswitch_6");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.8
-     * @title non-zero padding
-     */
-    public void testVFE6() {
-        try {
-            Class.forName("dxc.junit.opcodes.tableswitch.jm.T_tableswitch_7");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.1
-     * @title type of argument - reference
-     */
-    public void testVFE7() {
-        try {
-            Class.forName("dxc.junit.opcodes.tableswitch.jm.T_tableswitch_8");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.8
-     * @title number of entries in jump table
-     */
-    public void testVFE8() {
-        try {
-            Class.forName("dxc.junit.opcodes.tableswitch.jm.T_tableswitch_9");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_1.j b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_1.j
deleted file mode 100644
index e21d5c3..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_1.j
+++ /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_tableswitch_1.java
-.class public dxc/junit/opcodes/tableswitch/jm/T_tableswitch_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    tableswitch -1 3
-            Label0
-            Label3
-            Label3
-            Label1
-            Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_1.java b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_1.java
deleted file mode 100644
index 6feb6d8..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_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 dxc.junit.opcodes.tableswitch.jm;
-
-public class T_tableswitch_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/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_2.j b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_2.j
deleted file mode 100644
index 4fbe7d7..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_2.j
+++ /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_tableswitch_2.java
-.class public dxc/junit/opcodes/tableswitch/jm/T_tableswitch_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-;    iload_1
-    tableswitch 1 3
-            Label0
-            Label1
-            Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_2.java b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_2.java
deleted file mode 100644
index dd07d01..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_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 dxc.junit.opcodes.tableswitch.jm;
-
-public class T_tableswitch_2 {
-
-    public int run(int i) {
-        switch (i) {
-        case 1:
-            return 2;
-        case 2:
-        case 3:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_3.j b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_3.j
deleted file mode 100644
index 14f6827..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_3.j
+++ /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_tableswitch_3.java
-.class public dxc/junit/opcodes/tableswitch/jm/T_tableswitch_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    fconst_1
-    
-    tableswitch 1 3
-            Label0
-            Label1
-            Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_3.java b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_3.java
deleted file mode 100644
index fe2cfed..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_3.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 dxc.junit.opcodes.tableswitch.jm;
-
-public class T_tableswitch_3 {
-
-    public int run(int i) {
-        switch (i) {
-        case 1:
-            return 2;
-        case 2:
-        case 3:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4.cfh b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4.cfh
deleted file mode 100644
index f70e16c..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 51, h: 0006: utf8{"dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4"}
-    // .  .  0  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  t  a  b  l  e  s  w  i  t  c  h  /  j  m  /  T  _  t  a  b  l  e  s  w  i  t  c  h  _  4  
-       01 00 30 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 74 61 62 6c 65 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 74 61 62 6c 65 73 77 69 74 63 68 5f 34 
-    // parsed:, offset 113, len 23, h: 0007: utf8{"T_tableswitch_4.java"}
-    // .  .  .  T  _  t  a  b  l  e  s  w  i  t  c  h  _  4  .  j  a  v  a  
-       01 00 14 54 5f 74 61 62 6c 65 73 77 69 74 63 68 5f 34 2e 6a 61 76 61 
-    // parsed:, offset 136, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0a 
-    // parsed:, offset 141, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 148, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 154, len 3, h: 000b: type{dxc.junit.opcodes.tableswitch.jm.T_tableswitch_4}
-    // .  .  .  
-       07 00 06 
-    // parsed:, offset 157, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 160, len 7, h: 000d: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-// parsed:, offset 167, len 0, h: end constant_pool
-// parsed:, offset 167, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 169, len 2, h: this_class: type{dxc.junit.opcodes.tableswitch.jm.T_tableswitch_4}
-// .  .  
-   00 0b 
-// parsed:, offset 171, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 173, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 175, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 177, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 179, len:102,desc: ()V
-// parsed:, offset 179, len 0, h:  methods[0]: 
-    // parsed:, offset 179, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 181, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 183, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 185, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 187, len 0, h:  attributes[0]: 
-        // parsed:, offset 187, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 189, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 193, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 195, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 197, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 206, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 208, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 210, len 0, h: end attributes[0] 
-// parsed:, offset 210, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 210, len:71,desc: (I)I
-// parsed:, offset 210, len 0, h:  methods[1]: 
-    // parsed:, offset 210, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 212, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 214, len 2, h: descriptor: (I)I
-    // .  .  
-       00 0d 
-    // parsed:, offset 216, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 218, len 0, h:  attributes[0]: 
-        // parsed:, offset 218, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 220, len 4, h: length: 0000002f
-        // .  .  .  /  
-           00 00 00 2f 
-        // parsed:, offset 224, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 228, len 4, h: code_length: 00000023
-        // .  .  .  #  
-           00 00 00 23 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 27, h: 0001: tableswitch   +00000001: 001c   +00000002: 001e   +00000003: 001e   default: 0021
-        // .  .  .  .  .  .     .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  
-//@mod           aa 00 00 00 00 00 20 00 00 00 01 00 00 00 03 00 00 00 1b 00 00 00 1d 00 00 00 1d 
-           aa 00 00 00 00 00 20 00 00 00 01 00 00 00 03 00 00 00 1b 00 00 00 1d 00 00 00 ff 
-        // parsed:, offset 28, len 1, h: 001c: iconst_2 // #+02
-        // .  
-           05 
-        // parsed:, offset 29, len 1, h: 001d: ireturn
-        // .  
-           ac 
-        // parsed:, offset 30, len 2, h: 001e: bipush #+14
-        // .  .  
-           10 14 
-        // parsed:, offset 32, len 1, h: 0020: ireturn
-        // .  
-           ac 
-        // parsed:, offset 33, len 1, h: 0021: iconst_m1 // #-01
-        // .  
-           02 
-        // parsed:, offset 34, len 1, h: 0022: ireturn
-        // .  
-           ac 
-        // parsed:, offset 267, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 269, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 271, len 0, h: end attributes[0] 
-// parsed:, offset 271, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)I
-// parsed:, offset 271, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 273, len 0, h:  attributes[0]: 
-    // parsed:, offset 273, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 275, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 279, len 2, h: source: utf8{"T_tableswitch_4.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 281, len 0, h: end attributes[0] 
-// parsed:, offset 281, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4.j b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4.j
deleted file mode 100644
index b527e24..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4.j
+++ /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_tableswitch_4.java
-.class public dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    
-    tableswitch 1 3
-            Label0
-            Label1
-            Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4.java b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4.java
deleted file mode 100644
index ab0d8e1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_4.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 dxc.junit.opcodes.tableswitch.jm;
-
-public class T_tableswitch_4 {
-
-    public int run(int i) {
-        switch (i) {
-        case 1:
-            return 2;
-        case 2:
-        case 3:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5.cfh b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5.cfh
deleted file mode 100644
index 9d8b286..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 51, h: 0005: utf8{"dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5"}
-    // .  .  0  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  t  a  b  l  e  s  w  i  t  c  h  /  j  m  /  T  _  t  a  b  l  e  s  w  i  t  c  h  _  5  
-       01 00 30 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 74 61 62 6c 65 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 74 61 62 6c 65 73 77 69 74 63 68 5f 35 
-    // parsed:, offset 107, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 113, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0a 
-    // parsed:, offset 118, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 125, len 23, h: 0009: utf8{"T_tableswitch_5.java"}
-    // .  .  .  T  _  t  a  b  l  e  s  w  i  t  c  h  _  5  .  j  a  v  a  
-       01 00 14 54 5f 74 61 62 6c 65 73 77 69 74 63 68 5f 35 2e 6a 61 76 61 
-    // parsed:, offset 148, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 154, len 3, h: 000b: type{dxc.junit.opcodes.tableswitch.jm.T_tableswitch_5}
-    // .  .  .  
-       07 00 05 
-    // parsed:, offset 157, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 160, len 7, h: 000d: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-// parsed:, offset 167, len 0, h: end constant_pool
-// parsed:, offset 167, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 169, len 2, h: this_class: type{dxc.junit.opcodes.tableswitch.jm.T_tableswitch_5}
-// .  .  
-   00 0b 
-// parsed:, offset 171, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 173, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 175, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 177, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 179, len:105,desc: ()V
-// parsed:, offset 179, len 0, h:  methods[0]: 
-    // parsed:, offset 179, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 181, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 183, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 185, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 187, len 0, h:  attributes[0]: 
-        // parsed:, offset 187, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 189, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 193, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 195, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 197, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 206, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 208, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 210, len 0, h: end attributes[0] 
-// parsed:, offset 210, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 210, len:74,desc: (I)I
-// parsed:, offset 210, len 0, h:  methods[1]: 
-    // parsed:, offset 210, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 212, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 214, len 2, h: descriptor: (I)I
-    // .  .  
-       00 0d 
-    // parsed:, offset 216, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 218, len 0, h:  attributes[0]: 
-        // parsed:, offset 218, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 220, len 4, h: length: 00000032
-        // .  .  .  2  
-           00 00 00 32 
-        // parsed:, offset 224, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 228, len 4, h: code_length: 00000026
-        // .  .  .  &  
-           00 00 00 26 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 27, h: 0001: tableswitch   +00000001: 001c   +00000002: 001e   +00000003: 001e   default: 0021
-        // .  .  .  .  .  .     .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  
-//@mod           aa 00 00 00 00 00 20 00 00 00 01 00 00 00 03 00 00 00 1b 00 00 00 1d 00 00 00 1d 
-           aa 00 00 00 00 00 21 00 00 00 01 00 00 00 03 00 00 00 1b 00 00 00 1d 00 00 00 1d 
-        // parsed:, offset 28, len 1, h: 001c: iconst_2 // #+02
-        // .  
-           05 
-        // parsed:, offset 29, len 1, h: 001d: ireturn
-        // .  
-           ac 
-        // parsed:, offset 30, len 2, h: 001e: bipush #+14
-        // .  .  
-           10 14 
-        // parsed:, offset 32, len 1, h: 0020: ireturn
-        // .  
-           ac 
-        // parsed:, offset 33, len 4, h: 0021: wide iload 0001
-        // .  .  .  .  
-           c4 15 00 01 
-        // parsed:, offset 37, len 1, h: 0025: ireturn
-        // .  
-           ac 
-        // parsed:, offset 270, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 272, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 274, len 0, h: end attributes[0] 
-// parsed:, offset 274, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)I
-// parsed:, offset 274, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 276, len 0, h:  attributes[0]: 
-    // parsed:, offset 276, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 278, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 282, len 2, h: source: utf8{"T_tableswitch_5.java"}
-    // .  .  
-       00 09 
-// parsed:, offset 284, len 0, h: end attributes[0] 
-// parsed:, offset 284, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5.j b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5.j
deleted file mode 100644
index e085f06..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5.j
+++ /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_tableswitch_5.java
-.class public dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    
-    tableswitch 1 3
-            Label0
-            Label1
-            Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iload_w 1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5.java b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5.java
deleted file mode 100644
index 3702524..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_5.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 dxc.junit.opcodes.tableswitch.jm;
-
-public class T_tableswitch_5 {
-
-    public int run(int i) {
-        switch (i) {
-        case 1:
-            return 2;
-        case 2:
-        case 3:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6.cfh b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6.cfh
deleted file mode 100644
index 51a3fad..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6.cfh
+++ /dev/null
@@ -1,194 +0,0 @@
-//@class:dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0b 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 51, h: 0005: utf8{"dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6"}
-    // .  .  0  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  t  a  b  l  e  s  w  i  t  c  h  /  j  m  /  T  _  t  a  b  l  e  s  w  i  t  c  h  _  6  
-       01 00 30 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 74 61 62 6c 65 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 74 61 62 6c 65 73 77 69 74 63 68 5f 36 
-    // parsed:, offset 107, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 113, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 09 
-    // parsed:, offset 118, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 125, len 6, h: 0009: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 131, len 3, h: 000a: type{dxc.junit.opcodes.tableswitch.jm.T_tableswitch_6}
-    // .  .  .  
-       07 00 05 
-    // parsed:, offset 134, len 3, h: 000b: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 137, len 23, h: 000c: utf8{"T_tableswitch_6.java"}
-    // .  .  .  T  _  t  a  b  l  e  s  w  i  t  c  h  _  6  .  j  a  v  a  
-       01 00 14 54 5f 74 61 62 6c 65 73 77 69 74 63 68 5f 36 2e 6a 61 76 61 
-    // parsed:, offset 160, len 7, h: 000d: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-// parsed:, offset 167, len 0, h: end constant_pool
-// parsed:, offset 167, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 169, len 2, h: this_class: type{dxc.junit.opcodes.tableswitch.jm.T_tableswitch_6}
-// .  .  
-   00 0a 
-// parsed:, offset 171, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0b 
-// parsed:, offset 173, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 175, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 177, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 179, len:91,desc: ()V
-// parsed:, offset 179, len 0, h:  methods[0]: 
-    // parsed:, offset 179, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 181, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 183, len 2, h: descriptor: ()V
-    // .  .  
-       00 09 
-    // parsed:, offset 185, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 187, len 0, h:  attributes[0]: 
-        // parsed:, offset 187, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 189, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 193, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 195, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 197, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 206, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 208, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 210, len 0, h: end attributes[0] 
-// parsed:, offset 210, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 210, len:60,desc: (I)I
-// parsed:, offset 210, len 0, h:  methods[1]: 
-    // parsed:, offset 210, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 212, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 214, len 2, h: descriptor: (I)I
-    // .  .  
-       00 0d 
-    // parsed:, offset 216, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 218, len 0, h:  attributes[0]: 
-        // parsed:, offset 218, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 220, len 4, h: length: 00000024
-        // .  .  .  $  
-           00 00 00 24 
-        // parsed:, offset 224, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 228, len 4, h: code_length: 00000018
-        // .  .  .  .  
-           00 00 00 18 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 19, h: 0001: tableswitch   +00000001: 0014   default: 0016
-        // .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  
-//@mod           aa 00 00 00 00 00 15 00 00 00 01 00 00 00 01 00 00 00 13 
-                 aa 00 00 00 00 00 15 00 00 00 01 00 00 00 00 00 00 00 13 
-        // parsed:, offset 20, len 1, h: 0014: iconst_2 // #+02
-        // .  
-           05 
-        // parsed:, offset 21, len 1, h: 0015: ireturn
-        // .  
-           ac 
-        // parsed:, offset 22, len 1, h: 0016: iconst_m1 // #-01
-        // .  
-           02 
-        // parsed:, offset 23, len 1, h: 0017: ireturn
-        // .  
-           ac 
-        // parsed:, offset 256, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 258, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 260, len 0, h: end attributes[0] 
-// parsed:, offset 260, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)I
-// parsed:, offset 260, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 262, len 0, h:  attributes[0]: 
-    // parsed:, offset 262, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 264, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 268, len 2, h: source: utf8{"T_tableswitch_6.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 270, len 0, h: end attributes[0] 
-// parsed:, offset 270, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6.j b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6.j
deleted file mode 100644
index b290972..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6.j
+++ /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_tableswitch_6.java
-.class public dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    
-    tableswitch 1 1
-            Label0
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label3:
-    iconst_m1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6.java b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6.java
deleted file mode 100644
index 038bd4f..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_6.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 dxc.junit.opcodes.tableswitch.jm;
-
-public class T_tableswitch_6 {
-
-    public int run(int i) {
-        switch (i) {
-        case 1:
-            return 2;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7.cfh b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7.cfh
deleted file mode 100644
index 74cf765..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7.cfh
+++ /dev/null
@@ -1,200 +0,0 @@
-//@class:dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000e
-// .  .  
-   00 0e 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 51, h: 0004: utf8{"dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7"}
-    // .  .  0  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  t  a  b  l  e  s  w  i  t  c  h  /  j  m  /  T  _  t  a  b  l  e  s  w  i  t  c  h  _  7  
-       01 00 30 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 74 61 62 6c 65 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 74 61 62 6c 65 73 77 69 74 63 68 5f 37 
-    // parsed:, offset 98, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 107, len 23, h: 0006: utf8{"T_tableswitch_7.java"}
-    // .  .  .  T  _  t  a  b  l  e  s  w  i  t  c  h  _  7  .  j  a  v  a  
-       01 00 14 54 5f 74 61 62 6c 65 73 77 69 74 63 68 5f 37 2e 6a 61 76 61 
-    // parsed:, offset 130, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 136, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 141, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 148, len 3, h: 000a: type{dxc.junit.opcodes.tableswitch.jm.T_tableswitch_7}
-    // .  .  .  
-       07 00 04 
-    // parsed:, offset 151, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 157, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 160, len 7, h: 000d: utf8{"(I)I"}
-    // .  .  .  (  I  )  I  
-       01 00 04 28 49 29 49 
-// parsed:, offset 167, len 0, h: end constant_pool
-// parsed:, offset 167, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 169, len 2, h: this_class: type{dxc.junit.opcodes.tableswitch.jm.T_tableswitch_7}
-// .  .  
-   00 0a 
-// parsed:, offset 171, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 173, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 175, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 177, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 179, len:105,desc: ()V
-// parsed:, offset 179, len 0, h:  methods[0]: 
-    // parsed:, offset 179, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 181, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 183, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 185, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 187, len 0, h:  attributes[0]: 
-        // parsed:, offset 187, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 189, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 193, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 195, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 197, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 206, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 208, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 210, len 0, h: end attributes[0] 
-// parsed:, offset 210, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 210, len:74,desc: (I)I
-// parsed:, offset 210, len 0, h:  methods[1]: 
-    // parsed:, offset 210, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 212, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 214, len 2, h: descriptor: (I)I
-    // .  .  
-       00 0d 
-    // parsed:, offset 216, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 218, len 0, h:  attributes[0]: 
-        // parsed:, offset 218, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 220, len 4, h: length: 00000032
-        // .  .  .  2  
-           00 00 00 32 
-        // parsed:, offset 224, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 226, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 228, len 4, h: code_length: 00000026
-        // .  .  .  &  
-           00 00 00 26 
-        // parsed:, offset 0, len 1, h: 0000: iload_1 // 01
-        // .  
-           1b 
-        // parsed:, offset 1, len 27, h: 0001: tableswitch   +00000001: 001c   +00000002: 001e   +00000003: 001e   default: 0021
-        // .  .  .  .  .  .     .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  
-//@mod           aa 00 00 00 00 00 20 00 00 00 01 00 00 00 03 00 00 00 1b 00 00 00 1d 00 00 00 1d 
-           aa 00 01 00 00 00 20 00 00 00 01 00 00 00 03 00 00 00 1b 00 00 00 1d 00 00 00 1d 
-        // parsed:, offset 28, len 1, h: 001c: iconst_2 // #+02
-        // .  
-           05 
-        // parsed:, offset 29, len 1, h: 001d: ireturn
-        // .  
-           ac 
-        // parsed:, offset 30, len 2, h: 001e: bipush #+14
-        // .  .  
-           10 14 
-        // parsed:, offset 32, len 1, h: 0020: ireturn
-        // .  
-           ac 
-        // parsed:, offset 33, len 4, h: 0021: wide iload 0001
-        // .  .  .  .  
-           c4 15 00 01 
-        // parsed:, offset 37, len 1, h: 0025: ireturn
-        // .  
-           ac 
-        // parsed:, offset 270, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 272, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 274, len 0, h: end attributes[0] 
-// parsed:, offset 274, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: (I)I
-// parsed:, offset 274, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 276, len 0, h:  attributes[0]: 
-    // parsed:, offset 276, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 278, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 282, len 2, h: source: utf8{"T_tableswitch_7.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 284, len 0, h: end attributes[0] 
-// parsed:, offset 284, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7.j b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7.j
deleted file mode 100644
index e944ce0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7.j
+++ /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_tableswitch_7.java
-.class public dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-    iload_1
-    
-    tableswitch 1 3
-            Label0
-            Label1
-            Label1
-            default: Label3
-
-    Label0:
-    iconst_2
-    ireturn
-
-    Label1:
-    bipush 20
-    ireturn
-
-    Label3:
-    iload_w 1
-    ireturn
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7.java b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_7.java
deleted file mode 100644
index e36101b..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_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 dxc.junit.opcodes.tableswitch.jm;
-
-public class T_tableswitch_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/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_8.j b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_8.j
deleted file mode 100644
index d9d3f2a..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_8.j
+++ /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_tableswitch_8.java
-.class public dxc/junit/opcodes/tableswitch/jm/T_tableswitch_8
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-.method public run(I)I
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    
-    tableswitch 1 3
-            Label0
-            Label1
-            Label1
-            default: Label3
-
-    Label0:
-.line 8
-    iconst_2
-    ireturn
-
-    Label1:
-.line 11
-    bipush 20
-    ireturn
-
-    Label3:
-.line 13
-    iconst_m1
-
-    Label5:
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_8.java b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_8.java
deleted file mode 100644
index 205fec9..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_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 dxc.junit.opcodes.tableswitch.jm;
-
-public class T_tableswitch_8 {
-    
-    public int run(int i) {
-        switch (i) {
-        case 1:
-            return 2;
-        case 2:
-        case 3:
-            return 20;
-        default:
-            return -1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9.cfh b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9.cfh
deleted file mode 100644
index ded5708..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 51, h: 0003: utf8{"dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9"}
-    // .  .  0  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  t  a  b  l  e  s  w  i  t  c  h  /  j  m  /  T  _  t  a  b  l  e  s  w  i  t  c  h  _  9  
-       01 00 30 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 74 61 62 6c 65 73 77 69 74 63 68 2f 6a 6d 2f 54 5f 74 61 62 6c 65 73 77 69 74 63 68 5f 39 
-    // parsed:, offset 85, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 98, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 107, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 113, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0a 
-    // parsed:, offset 118, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 125, len 3, h: 0009: type{dxc.junit.opcodes.tableswitch.jm.T_tableswitch_9}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 128, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 134, len 23, h: 000b: utf8{"T_tableswitch_9.java"}
-    // .  .  .  T  _  t  a  b  l  e  s  w  i  t  c  h  _  9  .  j  a  v  a  
-       01 00 14 54 5f 74 61 62 6c 65 73 77 69 74 63 68 5f 39 2e 6a 61 76 61 
-    // parsed:, offset 157, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 160, len 0, h: end constant_pool
-// parsed:, offset 160, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 162, len 2, h: this_class: type{dxc.junit.opcodes.tableswitch.jm.T_tableswitch_9}
-// .  .  
-   00 09 
-// parsed:, offset 164, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 166, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 168, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 170, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 172, len:89,desc: ()V
-// parsed:, offset 172, len 0, h:  methods[0]: 
-    // parsed:, offset 172, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 174, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 176, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 178, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 180, len 0, h:  attributes[0]: 
-        // parsed:, offset 180, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 182, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 186, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 188, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 190, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 199, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 201, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 203, len 0, h: end attributes[0] 
-// parsed:, offset 203, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 203, len:58,desc: ()V
-// parsed:, offset 203, len 0, h:  methods[1]: 
-    // parsed:, offset 203, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 205, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 207, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 209, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 211, len 0, h:  attributes[0]: 
-        // parsed:, offset 211, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 213, len 4, h: length: 00000022
-        // .  .  .  "  
-           00 00 00 22 
-        // parsed:, offset 217, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 219, len 2, h: max_locals: 0002
-        // .  .  
-           00 02 
-        // parsed:, offset 221, len 4, h: code_length: 00000016
-        // .  .  .  .  
-           00 00 00 16 
-        // parsed:, offset 0, len 1, h: 0000: iconst_1 // #+01
-        // .  
-           04 
-        // parsed:, offset 1, len 19, h: 0001: tableswitch   +00000001: 0014   default: 0015
-        // .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  
-//@mod           aa 00 00 00 00 00 14 00 00 00 01 00 00 00 01 00 00 00 13 
-           aa 00 00 00 00 00 14 00 00 00 01 00 00 00 02 00 00 00 13 
-        // parsed:, offset 20, len 1, h: 0014: return
-        // .  
-           b1 
-        // parsed:, offset 21, len 1, h: 0015: return
-        // .  
-           b1 
-        // parsed:, offset 247, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 249, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 251, len 0, h: end attributes[0] 
-// parsed:, offset 251, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 251, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 253, len 0, h:  attributes[0]: 
-    // parsed:, offset 253, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 255, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 259, len 2, h: source: utf8{"T_tableswitch_9.java"}
-    // .  .  
-       00 0b 
-// parsed:, offset 261, len 0, h: end attributes[0] 
-// parsed:, offset 261, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9.j b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9.j
deleted file mode 100644
index 155aae4..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9.j
+++ /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_tableswitch_9.java
-.class public dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 2
-
-    iconst_1
-    tableswitch 1 1
-            Label0
-            default: Label1
-
-Label0:
-    return
-
-Label1:
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9.java b/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9.java
deleted file mode 100644
index 39f83b1..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/tableswitch/jm/T_tableswitch_9.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 dxc.junit.opcodes.tableswitch.jm;
-
-public class T_tableswitch_9 {
-
-    public int run(int i) {
-        switch (i) {
-        case 1:
-            return 2;
-        }
-        return 0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/wide/Test_wide.java b/tools/dx-tests/src/dxc/junit/opcodes/wide/Test_wide.java
deleted file mode 100644
index c27db48..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/wide/Test_wide.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.opcodes.wide;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-
-public class Test_wide extends DxTestCase {
-
-    /**
-     * Wide instruction is tested as part of wide version of particular
-     * instructions so here we just test if wide instruction can't be applied to
-     * wrong bytecode.
-     */
-
-    /**
-     * @constraint 4.8.1.5 (?)
-     * @title Wide instruction shall be applied only on defined
-     * instructions 
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.opcodes.wide.jm.T_wide_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.5 
-     * @title bytecode modified with wide instruction must not be
-     *          reachable directly
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.opcodes.wide.jm.T_wide_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_1.cfh b/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_1.cfh
deleted file mode 100644
index 0906ca2..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_1.cfh
+++ /dev/null
@@ -1,182 +0,0 @@
-//@class:dxc/junit/opcodes/wide/jm/T_wide_1
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0b 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 37, h: 0003: utf8{"dxc/junit/opcodes/wide/jm/T_wide_1"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  w  i  d  e  /  j  m  /  T  _  w  i  d  e  _  1  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 77 69 64 65 2f 6a 6d 2f 54 5f 77 69 64 65 5f 31 
-    // parsed:, offset 71, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 84, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 93, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 99, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 09 
-    // parsed:, offset 104, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 111, len 6, h: 0009: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 117, len 3, h: 000a: type{dxc.junit.opcodes.wide.jm.T_wide_1}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 120, len 3, h: 000b: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 123, len 16, h: 000c: utf8{"T_wide_1.java"}
-    // .  .  .  T  _  w  i  d  e  _  1  .  j  a  v  a  
-       01 00 0d 54 5f 77 69 64 65 5f 31 2e 6a 61 76 61 
-// parsed:, offset 139, len 0, h: end constant_pool
-// parsed:, offset 139, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 141, len 2, h: this_class: type{dxc.junit.opcodes.wide.jm.T_wide_1}
-// .  .  
-   00 0a 
-// parsed:, offset 143, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0b 
-// parsed:, offset 145, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 147, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 149, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 151, len:70,desc: ()V
-// parsed:, offset 151, len 0, h:  methods[0]: 
-    // parsed:, offset 151, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 153, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 155, len 2, h: descriptor: ()V
-    // .  .  
-       00 09 
-    // parsed:, offset 157, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 159, len 0, h:  attributes[0]: 
-        // parsed:, offset 159, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 161, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 165, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 167, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 169, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 178, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 180, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 182, len 0, h: end attributes[0] 
-// parsed:, offset 182, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 182, len:39,desc: ()V
-// parsed:, offset 182, len 0, h:  methods[1]: 
-    // parsed:, offset 182, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 184, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 186, len 2, h: descriptor: ()V
-    // .  .  
-       00 09 
-    // parsed:, offset 188, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 190, len 0, h:  attributes[0]: 
-        // parsed:, offset 190, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 192, len 4, h: length: 0000000f
-        // .  .  .  .  
-           00 00 00 0f 
-        // parsed:, offset 196, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 198, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 200, len 4, h: code_length: 00000003
-        // .  .  .  .  
-           00 00 00 03 
-        // parsed:, offset 0, len 1, h: 0000: nop
-        // .  
-//@mod           00
-           c4 
-        // parsed:, offset 1, len 1, h: 0001: nop
-        // .  
-           00 
-        // parsed:, offset 2, len 1, h: 0002: return
-        // .  
-           b1 
-        // parsed:, offset 207, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 209, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 211, len 0, h: end attributes[0] 
-// parsed:, offset 211, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 211, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 213, len 0, h:  attributes[0]: 
-    // parsed:, offset 213, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 215, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 219, len 2, h: source: utf8{"T_wide_1.java"}
-    // .  .  
-       00 0c 
-// parsed:, offset 221, len 0, h: end attributes[0] 
-// parsed:, offset 221, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_1.j b/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_1.j
deleted file mode 100644
index 7269f72..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_wide_1.java
-.class public dxc/junit/opcodes/wide/jm/T_wide_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-
-    nop
-    nop
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_1.java b/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_1.java
deleted file mode 100644
index a5f3ee0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_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 dxc.junit.opcodes.wide.jm;
-
-public class T_wide_1 {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_2.cfh b/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_2.cfh
deleted file mode 100644
index c6717db..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_2.cfh
+++ /dev/null
@@ -1,182 +0,0 @@
-//@class:dxc/junit/opcodes/wide/jm/T_wide_2
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 37, h: 0001: utf8{"dxc/junit/opcodes/wide/jm/T_wide_2"}
-    // .  .  "  d  x  c  /  j  u  n  i  t  /  o  p  c  o  d  e  s  /  w  i  d  e  /  j  m  /  T  _  w  i  d  e  _  2  
-       01 00 22 64 78 63 2f 6a 75 6e 69 74 2f 6f 70 63 6f 64 65 73 2f 77 69 64 65 2f 6a 6d 2f 54 5f 77 69 64 65 5f 32 
-    // parsed:, offset 47, len 5, h: 0002: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 08 
-    // parsed:, offset 52, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 71, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 84, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 93, len 16, h: 0006: utf8{"T_wide_2.java"}
-    // .  .  .  T  _  w  i  d  e  _  2  .  j  a  v  a  
-       01 00 0d 54 5f 77 69 64 65 5f 32 2e 6a 61 76 61 
-    // parsed:, offset 109, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 115, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0a 
-    // parsed:, offset 120, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 127, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 133, len 3, h: 000b: type{dxc.junit.opcodes.wide.jm.T_wide_2}
-    // .  .  .  
-       07 00 01 
-    // parsed:, offset 136, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 139, len 0, h: end constant_pool
-// parsed:, offset 139, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 141, len 2, h: this_class: type{dxc.junit.opcodes.wide.jm.T_wide_2}
-// .  .  
-   00 0b 
-// parsed:, offset 143, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 145, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 147, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 149, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 151, len:75,desc: ()V
-// parsed:, offset 151, len 0, h:  methods[0]: 
-    // parsed:, offset 151, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 153, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 155, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 157, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 159, len 0, h:  attributes[0]: 
-        // parsed:, offset 159, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 161, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 165, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 167, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 169, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 02 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 178, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 180, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 182, len 0, h: end attributes[0] 
-// parsed:, offset 182, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 182, len:44,desc: ()V
-// parsed:, offset 182, len 0, h:  methods[1]: 
-    // parsed:, offset 182, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 184, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 186, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 188, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 190, len 0, h:  attributes[0]: 
-        // parsed:, offset 190, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 192, len 4, h: length: 00000014
-        // .  .  .  .  
-           00 00 00 14 
-        // parsed:, offset 196, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 198, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 200, len 4, h: code_length: 00000008
-        // .  .  .  .  
-           00 00 00 08 
-        // parsed:, offset 0, len 3, h: 0000: goto 0003
-        // .  .  .  
-//@mod           a7 00 03 
-           a7 00 04 
-        // parsed:, offset 3, len 4, h: 0003: wide aload 0000
-        // .  .  .  .  
-           c4 19 00 00 
-        // parsed:, offset 7, len 1, h: 0007: return
-        // .  
-           b1 
-        // parsed:, offset 212, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 214, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 216, len 0, h: end attributes[0] 
-// parsed:, offset 216, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 216, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 218, len 0, h:  attributes[0]: 
-    // parsed:, offset 218, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 220, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 224, len 2, h: source: utf8{"T_wide_2.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 226, len 0, h: end attributes[0] 
-// parsed:, offset 226, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_2.j b/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_2.j
deleted file mode 100644
index 176ece0..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_2.j
+++ /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_wide_2.java
-.class public dxc/junit/opcodes/wide/jm/T_wide_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-
-    .limit stack 1
-    
-    goto Label0
-
-Label0:
-    aload_w 0
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_2.java b/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_2.java
deleted file mode 100644
index 50d5d46..0000000
--- a/tools/dx-tests/src/dxc/junit/opcodes/wide/jm/T_wide_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 dxc.junit.opcodes.wide.jm;
-
-public class T_wide_2 {
-
-    public void run() {
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/AllTests.java b/tools/dx-tests/src/dxc/junit/verify/AllTests.java
deleted file mode 100644
index 790c0d8..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/AllTests.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 dxc.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 java vm: test that "
-                + "structurally damaged files are rejected by the verifier");
-        suite.addTestSuite(dxc.junit.verify.t481_1.Test_t481_1.class);
-        suite.addTestSuite(dxc.junit.verify.t481_2.Test_t481_2.class);
-        suite.addTestSuite(dxc.junit.verify.t481_3.Test_t481_3.class);
-        suite.addTestSuite(dxc.junit.verify.t481_4.Test_t481_4.class);
-        suite.addTestSuite(dxc.junit.verify.t481_6.Test_t481_6.class);
-
-        suite.addTestSuite(dxc.junit.verify.t482_2.Test_t482_2.class);
-        suite.addTestSuite(dxc.junit.verify.t482_3.Test_t482_3.class);
-        suite.addTestSuite(dxc.junit.verify.t482_4.Test_t482_4.class);
-        suite.addTestSuite(dxc.junit.verify.t482_8.Test_t482_8.class);
-        suite.addTestSuite(dxc.junit.verify.t482_9.Test_t482_9.class);
-        suite.addTestSuite(dxc.junit.verify.t482_10.Test_t482_10.class);
-        suite.addTestSuite(dxc.junit.verify.t482_11.Test_t482_11.class);
-        suite.addTestSuite(dxc.junit.verify.t482_14.Test_t482_14.class);
-        suite.addTestSuite(dxc.junit.verify.t482_20.Test_t482_20.class);
-
-        return suite;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_1/Test_t481_1.java b/tools/dx-tests/src/dxc/junit/verify/t481_1/Test_t481_1.java
deleted file mode 100644
index cf26b1f..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_1/Test_t481_1.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 dxc.junit.verify.t481_1;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t481_1 extends DxTestCase {
-
-    /**
-     * @constraint 4.8.1.1
-     * @title code_length must not be zero
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t481_1.jm.T_t481_1_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_1/jm/T_t481_1_1.cfh b/tools/dx-tests/src/dxc/junit/verify/t481_1/jm/T_t481_1_1.cfh
deleted file mode 100644
index 4785bad7..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_1/jm/T_t481_1_1.cfh
+++ /dev/null
@@ -1,176 +0,0 @@
-//@class:dxc/junit/verify/t481_1/jm/T_t481_1_1
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 18, h: 0006: utf8{"T_t481_1_1.java"}
-    // .  .  .  T  _  t  4  8  1  _  1  _  1  .  j  a  v  a  
-       01 00 0f 54 5f 74 34 38 31 5f 31 5f 31 2e 6a 61 76 61 
-    // parsed:, offset 80, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0a 
-    // parsed:, offset 85, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 92, len 40, h: 0009: utf8{"dxc/junit/verify/t481_1/jm/T_t481_1_1"}
-    // .  .  %  d  x  c  /  j  u  n  i  t  /  v  e  r  i  f  y  /  t  4  8  1  _  1  /  j  m  /  T  _  t  4  8  1  _  1  _  1  
-       01 00 25 64 78 63 2f 6a 75 6e 69 74 2f 76 65 72 69 66 79 2f 74 34 38 31 5f 31 2f 6a 6d 2f 54 5f 74 34 38 31 5f 31 5f 31 
-    // parsed:, offset 132, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 138, len 3, h: 000b: type{dxc.junit.verify.t481_1.jm.T_t481_1_1}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 141, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 144, len 0, h: end constant_pool
-// parsed:, offset 144, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 146, len 2, h: this_class: type{dxc.junit.verify.t481_1.jm.T_t481_1_1}
-// .  .  
-   00 0b 
-// parsed:, offset 148, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 152, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 156, len:68,desc: ()V
-// parsed:, offset 156, len 0, h:  methods[0]: 
-    // parsed:, offset 156, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 158, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 160, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 162, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 164, len 0, h:  attributes[0]: 
-        // parsed:, offset 164, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 166, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 170, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 172, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 183, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 185, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 187, len 0, h: end attributes[0] 
-// parsed:, offset 187, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 187, len:37,desc: ()V
-// parsed:, offset 187, len 0, h:  methods[1]: 
-    // parsed:, offset 187, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 191, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 193, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 195, len 0, h:  attributes[0]: 
-        // parsed:, offset 195, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 197, len 4, h: length: 0000000d
-        // .  .  .  .  
-           00 00 00 0d 
-        // parsed:, offset 201, len 2, h: max_stack: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 205, len 4, h: code_length: 00000001
-        // .  .  .  .  
-//@mod           00 00 00 01 
-           00 00 00 00 
-        // parsed:, offset 0, len 1, h: 0000: return
-        // .  
-           b1 
-        // parsed:, offset 210, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 212, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 214, len 0, h: end attributes[0] 
-// parsed:, offset 214, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 214, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 216, len 0, h:  attributes[0]: 
-    // parsed:, offset 216, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 218, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 222, len 2, h: source: utf8{"T_t481_1_1.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 224, len 0, h: end attributes[0] 
-// parsed:, offset 224, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_1/jm/T_t481_1_1.j b/tools/dx-tests/src/dxc/junit/verify/t481_1/jm/T_t481_1_1.j
deleted file mode 100644
index fc6fad0..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_1/jm/T_t481_1_1.j
+++ /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_t481_1_1.java
-.class public dxc/junit/verify/t481_1/jm/T_t481_1_1
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_1/jm/T_t481_1_1.java b/tools/dx-tests/src/dxc/junit/verify/t481_1/jm/T_t481_1_1.java
deleted file mode 100644
index 3da0228..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_1/jm/T_t481_1_1.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 dxc.junit.verify.t481_1.jm;
-
-public class T_t481_1_1{
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_2/Test_t481_2.java b/tools/dx-tests/src/dxc/junit/verify/t481_2/Test_t481_2.java
deleted file mode 100644
index 4cabc23..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_2/Test_t481_2.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 dxc.junit.verify.t481_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t481_2 extends DxTestCase {
-
-    /**
-     * @constraint 4.8.1.2
-     * @title code_length must be less than 65536
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t481_2.jm.T_t481_2_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_2/jm/T_t481_2_1.cfh b/tools/dx-tests/src/dxc/junit/verify/t481_2/jm/T_t481_2_1.cfh
deleted file mode 100644
index 049d556..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_2/jm/T_t481_2_1.cfh
+++ /dev/null
@@ -1,176 +0,0 @@
-//@class:dxc/junit/verify/t481_2/jm/T_t481_2_1
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 09 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 40, h: 0004: utf8{"dxc/junit/verify/t481_2/jm/T_t481_2_1"}
-    // .  .  %  d  x  c  /  j  u  n  i  t  /  v  e  r  i  f  y  /  t  4  8  1  _  2  /  j  m  /  T  _  t  4  8  1  _  2  _  1  
-       01 00 25 64 78 63 2f 6a 75 6e 69 74 2f 76 65 72 69 66 79 2f 74 34 38 31 5f 32 2f 6a 6d 2f 54 5f 74 34 38 31 5f 32 5f 31 
-    // parsed:, offset 87, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 96, len 18, h: 0006: utf8{"T_t481_2_1.java"}
-    // .  .  .  T  _  t  4  8  1  _  2  _  1  .  j  a  v  a  
-       01 00 0f 54 5f 74 34 38 31 5f 32 5f 31 2e 6a 61 76 61 
-    // parsed:, offset 114, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 120, len 3, h: 0008: type{dxc.junit.verify.t481_2.jm.T_t481_2_1}
-    // .  .  .  
-       07 00 04 
-    // parsed:, offset 123, len 5, h: 0009: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 128, len 7, h: 000a: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 135, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 141, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 144, len 0, h: end constant_pool
-// parsed:, offset 144, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 146, len 2, h: this_class: type{dxc.junit.verify.t481_2.jm.T_t481_2_1}
-// .  .  
-   00 08 
-// parsed:, offset 148, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 152, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 156, len:68,desc: ()V
-// parsed:, offset 156, len 0, h:  methods[0]: 
-    // parsed:, offset 156, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 158, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 160, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 162, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 164, len 0, h:  attributes[0]: 
-        // parsed:, offset 164, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 166, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 170, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 172, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 183, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 185, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 187, len 0, h: end attributes[0] 
-// parsed:, offset 187, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 187, len:37,desc: ()V
-// parsed:, offset 187, len 0, h:  methods[1]: 
-    // parsed:, offset 187, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 191, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 193, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 195, len 0, h:  attributes[0]: 
-        // parsed:, offset 195, len 2, h: name: Code
-        // .  .  
-           00 0a 
-        // parsed:, offset 197, len 4, h: length: 0000000d
-        // .  .  .  .  
-           00 00 00 0d 
-        // parsed:, offset 201, len 2, h: max_stack: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 205, len 4, h: code_length: 00000001
-        // .  .  .  .  
-//@mod           00 00 00 01 
-           00 01 00 00 
-        // parsed:, offset 0, len 1, h: 0000: return
-        // .  
-           b1 
-        // parsed:, offset 210, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 212, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 214, len 0, h: end attributes[0] 
-// parsed:, offset 214, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 214, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 216, len 0, h:  attributes[0]: 
-    // parsed:, offset 216, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 218, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 222, len 2, h: source: utf8{"T_t481_2_1.java"}
-    // .  .  
-       00 06 
-// parsed:, offset 224, len 0, h: end attributes[0] 
-// parsed:, offset 224, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_2/jm/T_t481_2_1.j b/tools/dx-tests/src/dxc/junit/verify/t481_2/jm/T_t481_2_1.j
deleted file mode 100644
index e167ae6..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_2/jm/T_t481_2_1.j
+++ /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_t481_2_1.java
-.class public dxc/junit/verify/t481_2/jm/T_t481_2_1
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_2/jm/T_t481_2_1.java b/tools/dx-tests/src/dxc/junit/verify/t481_2/jm/T_t481_2_1.java
deleted file mode 100644
index 712596d..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_2/jm/T_t481_2_1.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 dxc.junit.verify.t481_2.jm;
-
-public class T_t481_2_1{
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_3/Test_t481_3.java b/tools/dx-tests/src/dxc/junit/verify/t481_3/Test_t481_3.java
deleted file mode 100644
index 2180f89..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_3/Test_t481_3.java
+++ /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.
- */
-
-package dxc.junit.verify.t481_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t481_3 extends DxTestCase {
-
-    /**
-     * @constraint 4.8.1.3
-     * @title First opcode instruction shall be at offset 0. The idea of
-     * the test is to put invalid opcode at offset 0.
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t481_3.jm.T_t481_3_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_3/jm/T_t481_3_1.cfh b/tools/dx-tests/src/dxc/junit/verify/t481_3/jm/T_t481_3_1.cfh
deleted file mode 100644
index 9fdc97c..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_3/jm/T_t481_3_1.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/verify/t481_3/jm/T_t481_3_1
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0b 00 06 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 08 
-    // parsed:, offset 67, len 7, h: 0007: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 74, len 6, h: 0008: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 80, len 18, h: 0009: utf8{"T_t481_3_1.java"}
-    // .  .  .  T  _  t  4  8  1  _  3  _  1  .  j  a  v  a  
-       01 00 0f 54 5f 74 34 38 31 5f 33 5f 31 2e 6a 61 76 61 
-    // parsed:, offset 98, len 40, h: 000a: utf8{"dxc/junit/verify/t481_3/jm/T_t481_3_1"}
-    // .  .  %  d  x  c  /  j  u  n  i  t  /  v  e  r  i  f  y  /  t  4  8  1  _  3  /  j  m  /  T  _  t  4  8  1  _  3  _  1  
-       01 00 25 64 78 63 2f 6a 75 6e 69 74 2f 76 65 72 69 66 79 2f 74 34 38 31 5f 33 2f 6a 6d 2f 54 5f 74 34 38 31 5f 33 5f 31 
-    // parsed:, offset 138, len 3, h: 000b: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-    // parsed:, offset 141, len 3, h: 000c: type{dxc.junit.verify.t481_3.jm.T_t481_3_1}
-    // .  .  .  
-       07 00 0a 
-// parsed:, offset 144, len 0, h: end constant_pool
-// parsed:, offset 144, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 146, len 2, h: this_class: type{dxc.junit.verify.t481_3.jm.T_t481_3_1}
-// .  .  
-   00 0c 
-// parsed:, offset 148, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0b 
-// parsed:, offset 150, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 152, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 156, len:71,desc: ()V
-// parsed:, offset 156, len 0, h:  methods[0]: 
-    // parsed:, offset 156, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 158, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 160, len 2, h: descriptor: ()V
-    // .  .  
-       00 08 
-    // parsed:, offset 162, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 164, len 0, h:  attributes[0]: 
-        // parsed:, offset 164, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 166, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 170, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 172, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 183, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 185, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 187, len 0, h: end attributes[0] 
-// parsed:, offset 187, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 187, len:40,desc: ()V
-// parsed:, offset 187, len 0, h:  methods[1]: 
-    // parsed:, offset 187, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 191, len 2, h: descriptor: ()V
-    // .  .  
-       00 08 
-    // parsed:, offset 193, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 195, len 0, h:  attributes[0]: 
-        // parsed:, offset 195, len 2, h: name: Code
-        // .  .  
-           00 07 
-        // parsed:, offset 197, len 4, h: length: 00000010
-        // .  .  .  .  
-           00 00 00 10 
-        // parsed:, offset 201, len 2, h: max_stack: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 205, len 4, h: code_length: 00000004
-        // .  .  .  .  
-           00 00 00 04 
-        // parsed:, offset 0, len 1, h: 0000: nop
-        // .  
-//@mod           00 
-           ff 
-        // parsed:, offset 1, len 1, h: 0001: nop
-        // .  
-           00 
-        // parsed:, offset 2, len 1, h: 0002: nop
-        // .  
-           00 
-        // parsed:, offset 3, len 1, h: 0003: return
-        // .  
-           b1 
-        // parsed:, offset 213, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 215, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 217, len 0, h: end attributes[0] 
-// parsed:, offset 217, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 217, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 219, len 0, h:  attributes[0]: 
-    // parsed:, offset 219, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 221, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 225, len 2, h: source: utf8{"T_t481_3_1.java"}
-    // .  .  
-       00 09 
-// parsed:, offset 227, len 0, h: end attributes[0] 
-// parsed:, offset 227, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_3/jm/T_t481_3_1.j b/tools/dx-tests/src/dxc/junit/verify/t481_3/jm/T_t481_3_1.j
deleted file mode 100644
index fd5258f..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_3/jm/T_t481_3_1.j
+++ /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_t481_3_1.java
-.class public dxc/junit/verify/t481_3/jm/T_t481_3_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-    
-    nop
-    nop
-    nop
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_3/jm/T_t481_3_1.java b/tools/dx-tests/src/dxc/junit/verify/t481_3/jm/T_t481_3_1.java
deleted file mode 100644
index 4cd3dcf..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_3/jm/T_t481_3_1.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 dxc.junit.verify.t481_3.jm;
-
-public class T_t481_3_1{
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/Test_t481_4.java b/tools/dx-tests/src/dxc/junit/verify/t481_4/Test_t481_4.java
deleted file mode 100644
index d333420..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/Test_t481_4.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dxc.junit.verify.t481_4;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t481_4 extends DxTestCase {
-
-    /**
-     * @constraint 4.8.1.4
-     * @title opcode 254 (0xfe) may not appear in code array
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t481_4.jm.T_t481_4_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.4
-     * @title opcode 255 (0xff) may not appear in code array
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.verify.t481_4.jm.T_t481_4_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.4
-     * @title opcode 202 (0xca) may not appear in code array
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.verify.t481_4.jm.T_t481_4_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.1.4
-     * @title undocumented opcode 240 (F0) may not appear in code array
-     */
-    public void testVFE4() {
-        try {
-            Class.forName("dxc.junit.verify.t481_4.jm.T_t481_4_4");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_1.cfh b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_1.cfh
deleted file mode 100644
index 6f6a4d2..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_1.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/verify/t481_4/jm/T_t481_4_1
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 40, h: 0005: utf8{"dxc/junit/verify/t481_4/jm/T_t481_4_1"}
-    // .  .  %  d  x  c  /  j  u  n  i  t  /  v  e  r  i  f  y  /  t  4  8  1  _  4  /  j  m  /  T  _  t  4  8  1  _  4  _  1  
-       01 00 25 64 78 63 2f 6a 75 6e 69 74 2f 76 65 72 69 66 79 2f 74 34 38 31 5f 34 2f 6a 6d 2f 54 5f 74 34 38 31 5f 34 5f 31 
-    // parsed:, offset 96, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 102, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0a 
-    // parsed:, offset 107, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 114, len 3, h: 0009: type{dxc.junit.verify.t481_4.jm.T_t481_4_1}
-    // .  .  .  
-       07 00 05 
-    // parsed:, offset 117, len 6, h: 000a: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 123, len 18, h: 000b: utf8{"T_t481_4_1.java"}
-    // .  .  .  T  _  t  4  8  1  _  4  _  1  .  j  a  v  a  
-       01 00 0f 54 5f 74 34 38 31 5f 34 5f 31 2e 6a 61 76 61 
-    // parsed:, offset 141, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 144, len 0, h: end constant_pool
-// parsed:, offset 144, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 146, len 2, h: this_class: type{dxc.junit.verify.t481_4.jm.T_t481_4_1}
-// .  .  
-   00 09 
-// parsed:, offset 148, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 152, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 156, len:71,desc: ()V
-// parsed:, offset 156, len 0, h:  methods[0]: 
-    // parsed:, offset 156, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 158, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 160, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 162, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 164, len 0, h:  attributes[0]: 
-        // parsed:, offset 164, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 166, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 170, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 172, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 183, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 185, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 187, len 0, h: end attributes[0] 
-// parsed:, offset 187, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 187, len:40,desc: ()V
-// parsed:, offset 187, len 0, h:  methods[1]: 
-    // parsed:, offset 187, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 191, len 2, h: descriptor: ()V
-    // .  .  
-       00 0a 
-    // parsed:, offset 193, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 195, len 0, h:  attributes[0]: 
-        // parsed:, offset 195, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 197, len 4, h: length: 00000010
-        // .  .  .  .  
-           00 00 00 10 
-        // parsed:, offset 201, len 2, h: max_stack: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 205, len 4, h: code_length: 00000004
-        // .  .  .  .  
-           00 00 00 04 
-        // parsed:, offset 0, len 1, h: 0000: nop
-        // .  
-           00 
-        // parsed:, offset 1, len 1, h: 0001: nop
-        // .  
-//@mod           00 
-           fe
-        // parsed:, offset 2, len 1, h: 0002: nop
-        // .  
-           00 
-        // parsed:, offset 3, len 1, h: 0003: return
-        // .  
-           b1 
-        // parsed:, offset 213, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 215, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 217, len 0, h: end attributes[0] 
-// parsed:, offset 217, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 217, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 219, len 0, h:  attributes[0]: 
-    // parsed:, offset 219, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 221, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 225, len 2, h: source: utf8{"T_t481_4_1.java"}
-    // .  .  
-       00 0b 
-// parsed:, offset 227, len 0, h: end attributes[0] 
-// parsed:, offset 227, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_1.j b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_1.j
deleted file mode 100644
index f652640..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_1.j
+++ /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_t481_4_1.java
-.class public dxc/junit/verify/t481_4/jm/T_t481_4_1
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-    
-    nop
-    nop
-    nop
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_1.java b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_1.java
deleted file mode 100644
index 8caaaca..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_1.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 dxc.junit.verify.t481_4.jm;
-
-public class T_t481_4_1{
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_2.cfh b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_2.cfh
deleted file mode 100644
index 13dee05..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_2.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/verify/t481_4/jm/T_t481_4_2
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 18, h: 0001: utf8{"T_t481_4_2.java"}
-    // .  .  .  T  _  t  4  8  1  _  4  _  2  .  j  a  v  a  
-       01 00 0f 54 5f 74 34 38 31 5f 34 5f 32 2e 6a 61 76 61 
-    // parsed:, offset 28, len 5, h: 0002: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 08 
-    // parsed:, offset 33, len 19, h: 0003: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 52, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 65, len 40, h: 0005: utf8{"dxc/junit/verify/t481_4/jm/T_t481_4_2"}
-    // .  .  %  d  x  c  /  j  u  n  i  t  /  v  e  r  i  f  y  /  t  4  8  1  _  4  /  j  m  /  T  _  t  4  8  1  _  4  _  2  
-       01 00 25 64 78 63 2f 6a 75 6e 69 74 2f 76 65 72 69 66 79 2f 74 34 38 31 5f 34 2f 6a 6d 2f 54 5f 74 34 38 31 5f 34 5f 32 
-    // parsed:, offset 105, len 9, h: 0006: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 114, len 6, h: 0007: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 120, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 06 00 0b 
-    // parsed:, offset 125, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 132, len 3, h: 000a: type{dxc.junit.verify.t481_4.jm.T_t481_4_2}
-    // .  .  .  
-       07 00 05 
-    // parsed:, offset 135, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 141, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 03 
-// parsed:, offset 144, len 0, h: end constant_pool
-// parsed:, offset 144, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 146, len 2, h: this_class: type{dxc.junit.verify.t481_4.jm.T_t481_4_2}
-// .  .  
-   00 0a 
-// parsed:, offset 148, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 152, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 156, len:71,desc: ()V
-// parsed:, offset 156, len 0, h:  methods[0]: 
-    // parsed:, offset 156, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 158, len 2, h: name: <init>
-    // .  .  
-       00 06 
-    // parsed:, offset 160, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 162, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 164, len 0, h:  attributes[0]: 
-        // parsed:, offset 164, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 166, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 170, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 172, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 02 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 183, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 185, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 187, len 0, h: end attributes[0] 
-// parsed:, offset 187, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 187, len:40,desc: ()V
-// parsed:, offset 187, len 0, h:  methods[1]: 
-    // parsed:, offset 187, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 2, h: name: run
-    // .  .  
-       00 07 
-    // parsed:, offset 191, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 193, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 195, len 0, h:  attributes[0]: 
-        // parsed:, offset 195, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 197, len 4, h: length: 00000010
-        // .  .  .  .  
-           00 00 00 10 
-        // parsed:, offset 201, len 2, h: max_stack: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 205, len 4, h: code_length: 00000004
-        // .  .  .  .  
-           00 00 00 04 
-        // parsed:, offset 0, len 1, h: 0000: nop
-        // .  
-           00 
-        // parsed:, offset 1, len 1, h: 0001: nop
-        // .  
-//@mod           00 
-           ff 
-        // parsed:, offset 2, len 1, h: 0002: nop
-        // .  
-           00 
-        // parsed:, offset 3, len 1, h: 0003: return
-        // .  
-           b1 
-        // parsed:, offset 213, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 215, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 217, len 0, h: end attributes[0] 
-// parsed:, offset 217, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 217, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 219, len 0, h:  attributes[0]: 
-    // parsed:, offset 219, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 221, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 225, len 2, h: source: utf8{"T_t481_4_2.java"}
-    // .  .  
-       00 01 
-// parsed:, offset 227, len 0, h: end attributes[0] 
-// parsed:, offset 227, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_2.j b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_2.j
deleted file mode 100644
index 1b5b83b..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_2.j
+++ /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_t481_4_2.java
-.class public dxc/junit/verify/t481_4/jm/T_t481_4_2
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-    
-    nop
-    nop
-    nop
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_2.java b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_2.java
deleted file mode 100644
index bbc58a4..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_2.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 dxc.junit.verify.t481_4.jm;
-
-public class T_t481_4_2{
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_3.cfh b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_3.cfh
deleted file mode 100644
index c195228..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_3.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/verify/t481_4/jm/T_t481_4_3
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 08 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 40, h: 0004: utf8{"dxc/junit/verify/t481_4/jm/T_t481_4_3"}
-    // .  .  %  d  x  c  /  j  u  n  i  t  /  v  e  r  i  f  y  /  t  4  8  1  _  4  /  j  m  /  T  _  t  4  8  1  _  4  _  3  
-       01 00 25 64 78 63 2f 6a 75 6e 69 74 2f 76 65 72 69 66 79 2f 74 34 38 31 5f 34 2f 6a 6d 2f 54 5f 74 34 38 31 5f 34 5f 33 
-    // parsed:, offset 87, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 96, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 102, len 18, h: 0007: utf8{"T_t481_4_3.java"}
-    // .  .  .  T  _  t  4  8  1  _  4  _  3  .  j  a  v  a  
-       01 00 0f 54 5f 74 34 38 31 5f 34 5f 33 2e 6a 61 76 61 
-    // parsed:, offset 120, len 5, h: 0008: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 125, len 7, h: 0009: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 132, len 3, h: 000a: type{dxc.junit.verify.t481_4.jm.T_t481_4_3}
-    // .  .  .  
-       07 00 04 
-    // parsed:, offset 135, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 141, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 144, len 0, h: end constant_pool
-// parsed:, offset 144, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 146, len 2, h: this_class: type{dxc.junit.verify.t481_4.jm.T_t481_4_3}
-// .  .  
-   00 0a 
-// parsed:, offset 148, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 152, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 156, len:71,desc: ()V
-// parsed:, offset 156, len 0, h:  methods[0]: 
-    // parsed:, offset 156, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 158, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 160, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 162, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 164, len 0, h:  attributes[0]: 
-        // parsed:, offset 164, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 166, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 170, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 172, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 183, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 185, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 187, len 0, h: end attributes[0] 
-// parsed:, offset 187, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 187, len:40,desc: ()V
-// parsed:, offset 187, len 0, h:  methods[1]: 
-    // parsed:, offset 187, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 191, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 193, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 195, len 0, h:  attributes[0]: 
-        // parsed:, offset 195, len 2, h: name: Code
-        // .  .  
-           00 09 
-        // parsed:, offset 197, len 4, h: length: 00000010
-        // .  .  .  .  
-           00 00 00 10 
-        // parsed:, offset 201, len 2, h: max_stack: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 205, len 4, h: code_length: 00000004
-        // .  .  .  .  
-           00 00 00 04 
-        // parsed:, offset 0, len 1, h: 0000: nop
-        // .  
-           00 
-        // parsed:, offset 1, len 1, h: 0001: nop
-        // .  
-//@mod           00 
-           ca 
-        // parsed:, offset 2, len 1, h: 0002: nop
-        // .  
-           00 
-        // parsed:, offset 3, len 1, h: 0003: return
-        // .  
-           b1 
-        // parsed:, offset 213, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 215, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 217, len 0, h: end attributes[0] 
-// parsed:, offset 217, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 217, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 219, len 0, h:  attributes[0]: 
-    // parsed:, offset 219, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 221, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 225, len 2, h: source: utf8{"T_t481_4_3.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 227, len 0, h: end attributes[0] 
-// parsed:, offset 227, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_3.j b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_3.j
deleted file mode 100644
index 06cb586..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_3.j
+++ /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_t481_4_3.java
-.class public dxc/junit/verify/t481_4/jm/T_t481_4_3
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-    
-    nop
-    nop
-    nop
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_3.java b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_3.java
deleted file mode 100644
index bd9df26..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_3.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 dxc.junit.verify.t481_4.jm;
-
-public class T_t481_4_3{
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_4.cfh b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_4.cfh
deleted file mode 100644
index 6b94100..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_4.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/verify/t481_4/jm/T_t481_4_4
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 07 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 40, h: 0003: utf8{"dxc/junit/verify/t481_4/jm/T_t481_4_4"}
-    // .  .  %  d  x  c  /  j  u  n  i  t  /  v  e  r  i  f  y  /  t  4  8  1  _  4  /  j  m  /  T  _  t  4  8  1  _  4  _  4  
-       01 00 25 64 78 63 2f 6a 75 6e 69 74 2f 76 65 72 69 66 79 2f 74 34 38 31 5f 34 2f 6a 6d 2f 54 5f 74 34 38 31 5f 34 5f 34 
-    // parsed:, offset 74, len 13, h: 0004: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 87, len 9, h: 0005: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 96, len 6, h: 0006: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 102, len 5, h: 0007: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 05 00 0b 
-    // parsed:, offset 107, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 114, len 3, h: 0009: type{dxc.junit.verify.t481_4.jm.T_t481_4_4}
-    // .  .  .  
-       07 00 03 
-    // parsed:, offset 117, len 18, h: 000a: utf8{"T_t481_4_4.java"}
-    // .  .  .  T  _  t  4  8  1  _  4  _  4  .  j  a  v  a  
-       01 00 0f 54 5f 74 34 38 31 5f 34 5f 34 2e 6a 61 76 61 
-    // parsed:, offset 135, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 141, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 144, len 0, h: end constant_pool
-// parsed:, offset 144, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 146, len 2, h: this_class: type{dxc.junit.verify.t481_4.jm.T_t481_4_4}
-// .  .  
-   00 09 
-// parsed:, offset 148, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 152, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 156, len:71,desc: ()V
-// parsed:, offset 156, len 0, h:  methods[0]: 
-    // parsed:, offset 156, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 158, len 2, h: name: <init>
-    // .  .  
-       00 05 
-    // parsed:, offset 160, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 162, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 164, len 0, h:  attributes[0]: 
-        // parsed:, offset 164, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 166, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 170, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 172, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 183, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 185, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 187, len 0, h: end attributes[0] 
-// parsed:, offset 187, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 187, len:40,desc: ()V
-// parsed:, offset 187, len 0, h:  methods[1]: 
-    // parsed:, offset 187, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 2, h: name: run
-    // .  .  
-       00 06 
-    // parsed:, offset 191, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 193, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 195, len 0, h:  attributes[0]: 
-        // parsed:, offset 195, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 197, len 4, h: length: 00000010
-        // .  .  .  .  
-           00 00 00 10 
-        // parsed:, offset 201, len 2, h: max_stack: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 205, len 4, h: code_length: 00000004
-        // .  .  .  .  
-           00 00 00 04 
-        // parsed:, offset 0, len 1, h: 0000: nop
-        // .  
-           00 
-        // parsed:, offset 1, len 1, h: 0001: nop
-        // .  
-//@mod           00 
-           f0 
-        // parsed:, offset 2, len 1, h: 0002: nop
-        // .  
-           00 
-        // parsed:, offset 3, len 1, h: 0003: return
-        // .  
-           b1 
-        // parsed:, offset 213, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 215, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 217, len 0, h: end attributes[0] 
-// parsed:, offset 217, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 217, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 219, len 0, h:  attributes[0]: 
-    // parsed:, offset 219, len 2, h: name: SourceFile
-    // .  .  
-       00 04 
-    // parsed:, offset 221, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 225, len 2, h: source: utf8{"T_t481_4_4.java"}
-    // .  .  
-       00 0a 
-// parsed:, offset 227, len 0, h: end attributes[0] 
-// parsed:, offset 227, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_4.j b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_4.j
deleted file mode 100644
index 07e8168..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_4.j
+++ /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_t481_4_4.java
-.class public dxc/junit/verify/t481_4/jm/T_t481_4_4
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-    
-    nop
-    nop
-    nop
-    
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_4.java b/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_4.java
deleted file mode 100644
index 17fed6f..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_4/jm/T_t481_4_4.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 dxc.junit.verify.t481_4.jm;
-
-public class T_t481_4_4{
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_6/Test_t481_6.java b/tools/dx-tests/src/dxc/junit/verify/t481_6/Test_t481_6.java
deleted file mode 100644
index 7dec5bd..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_6/Test_t481_6.java
+++ /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.
- */
-
-package dxc.junit.verify.t481_6;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t481_6 extends DxTestCase {
-
-    /**
-     * @constraint 4.8.1.6
-     * @title Last opcode instruction shall be at offset code_length -1.
-     * The idea of the test is to put invalid opcode at offset code_length -1.
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t481_6.jm.T_t481_6_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_6/jm/T_t481_6_1.cfh b/tools/dx-tests/src/dxc/junit/verify/t481_6/jm/T_t481_6_1.cfh
deleted file mode 100644
index 188b796..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_6/jm/T_t481_6_1.cfh
+++ /dev/null
@@ -1,185 +0,0 @@
-//@class:dxc/junit/verify/t481_6/jm/T_t481_6_1
-// parsed:, offset 0, len 0, h: begin classfile
-// parsed:, offset 0, len 4, h: magic: cafebabe
-// .  .  .  .  
-   ca fe ba be 
-// parsed:, offset 4, len 2, h: minor_version: 0003
-// .  .  
-   00 03 
-// parsed:, offset 6, len 2, h: major_version: 002d
-// .  -  
-   00 2d 
-// parsed:, offset 8, len 2, h: constant_pool_count: 000d
-// .  .  
-   00 0d 
-// parsed:, offset 10, len 0, h:  constant_pool:
-    // parsed:, offset 10, len 5, h: 0001: method{java.lang.Object.<init>:()V}
-    // .  .  .  .  .  
-       0a 00 0c 00 06 
-    // parsed:, offset 15, len 19, h: 0002: utf8{"java/lang/Object"}
-    // .  .  .  j  a  v  a  /  l  a  n  g  /  O  b  j  e  c  t  
-       01 00 10 6a 61 76 61 2f 6c 61 6e 67 2f 4f 62 6a 65 63 74 
-    // parsed:, offset 34, len 13, h: 0003: utf8{"SourceFile"}
-    // .  .  .  S  o  u  r  c  e  F  i  l  e  
-       01 00 0a 53 6f 75 72 63 65 46 69 6c 65 
-    // parsed:, offset 47, len 9, h: 0004: utf8{"<init>"}
-    // .  .  .  <  i  n  i  t  >  
-       01 00 06 3c 69 6e 69 74 3e 
-    // parsed:, offset 56, len 6, h: 0005: utf8{"run"}
-    // .  .  .  r  u  n  
-       01 00 03 72 75 6e 
-    // parsed:, offset 62, len 5, h: 0006: nat{<init>:()V}
-    // .  .  .  .  .  
-       0c 00 04 00 0b 
-    // parsed:, offset 67, len 18, h: 0007: utf8{"T_t481_6_1.java"}
-    // .  .  .  T  _  t  4  8  1  _  6  _  1  .  j  a  v  a  
-       01 00 0f 54 5f 74 34 38 31 5f 36 5f 31 2e 6a 61 76 61 
-    // parsed:, offset 85, len 7, h: 0008: utf8{"Code"}
-    // .  .  .  C  o  d  e  
-       01 00 04 43 6f 64 65 
-    // parsed:, offset 92, len 40, h: 0009: utf8{"dxc/junit/verify/t481_6/jm/T_t481_6_1"}
-    // .  .  %  d  x  c  /  j  u  n  i  t  /  v  e  r  i  f  y  /  t  4  8  1  _  6  /  j  m  /  T  _  t  4  8  1  _  6  _  1  
-       01 00 25 64 78 63 2f 6a 75 6e 69 74 2f 76 65 72 69 66 79 2f 74 34 38 31 5f 36 2f 6a 6d 2f 54 5f 74 34 38 31 5f 36 5f 31 
-    // parsed:, offset 132, len 3, h: 000a: type{dxc.junit.verify.t481_6.jm.T_t481_6_1}
-    // .  .  .  
-       07 00 09 
-    // parsed:, offset 135, len 6, h: 000b: utf8{"()V"}
-    // .  .  .  (  )  V  
-       01 00 03 28 29 56 
-    // parsed:, offset 141, len 3, h: 000c: type{java.lang.Object}
-    // .  .  .  
-       07 00 02 
-// parsed:, offset 144, len 0, h: end constant_pool
-// parsed:, offset 144, len 2, h: access_flags: public|super
-// .  !  
-   00 21 
-// parsed:, offset 146, len 2, h: this_class: type{dxc.junit.verify.t481_6.jm.T_t481_6_1}
-// .  .  
-   00 0a 
-// parsed:, offset 148, len 2, h: super_class: type{java.lang.Object}
-// .  .  
-   00 0c 
-// parsed:, offset 150, len 2, h: interfaces_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 152, len 2, h: fields_count: 0000
-// .  .  
-   00 00 
-// parsed:, offset 154, len 2, h: methods_count: 0002
-// .  .  
-   00 02 
-// ========== start-ParseMember:<init>, offset 156, len:71,desc: ()V
-// parsed:, offset 156, len 0, h:  methods[0]: 
-    // parsed:, offset 156, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 158, len 2, h: name: <init>
-    // .  .  
-       00 04 
-    // parsed:, offset 160, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 162, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 164, len 0, h:  attributes[0]: 
-        // parsed:, offset 164, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 166, len 4, h: length: 00000011
-        // .  .  .  .  
-           00 00 00 11 
-        // parsed:, offset 170, len 2, h: max_stack: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 172, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 174, len 4, h: code_length: 00000005
-        // .  .  .  .  
-           00 00 00 05 
-        // parsed:, offset 0, len 1, h: 0000: aload_0 // 00
-        // *  
-           2a 
-        // parsed:, offset 1, len 3, h: 0001: invokespecial method{java.lang.Object.<init>:()V}
-        // .  .  .  
-           b7 00 01 
-        // parsed:, offset 4, len 1, h: 0004: return
-        // .  
-           b1 
-        // parsed:, offset 183, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 185, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 187, len 0, h: end attributes[0] 
-// parsed:, offset 187, len 0, h: end methods[0] 
-// ========== end-ParseMember:<init>, desc: ()V
-// ========== start-ParseMember:run, offset 187, len:40,desc: ()V
-// parsed:, offset 187, len 0, h:  methods[1]: 
-    // parsed:, offset 187, len 2, h: access_flags: public
-    // .  .  
-       00 01 
-    // parsed:, offset 189, len 2, h: name: run
-    // .  .  
-       00 05 
-    // parsed:, offset 191, len 2, h: descriptor: ()V
-    // .  .  
-       00 0b 
-    // parsed:, offset 193, len 2, h: attributes_count: 0001
-    // .  .  
-       00 01 
-    // parsed:, offset 195, len 0, h:  attributes[0]: 
-        // parsed:, offset 195, len 2, h: name: Code
-        // .  .  
-           00 08 
-        // parsed:, offset 197, len 4, h: length: 00000010
-        // .  .  .  .  
-           00 00 00 10 
-        // parsed:, offset 201, len 2, h: max_stack: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 203, len 2, h: max_locals: 0001
-        // .  .  
-           00 01 
-        // parsed:, offset 205, len 4, h: code_length: 00000004
-        // .  .  .  .  
-           00 00 00 04 
-        // parsed:, offset 0, len 1, h: 0000: nop
-        // .  
-           00 
-        // parsed:, offset 1, len 1, h: 0001: nop
-        // .  
-           00 
-        // parsed:, offset 2, len 1, h: 0002: return
-        // .  
-           b1 
-        // parsed:, offset 3, len 1, h: 0003: nop
-        // .  
-//@mod           00 
-           ff 
-        // parsed:, offset 213, len 2, h: exception_table_length: 0000
-        // .  .  
-           00 00 
-        // parsed:, offset 215, len 2, h: attributes_count: 0000
-        // .  .  
-           00 00 
-    // parsed:, offset 217, len 0, h: end attributes[0] 
-// parsed:, offset 217, len 0, h: end methods[1] 
-// ========== end-ParseMember:run, desc: ()V
-// parsed:, offset 217, len 2, h: attributes_count: 0001
-// .  .  
-   00 01 
-// parsed:, offset 219, len 0, h:  attributes[0]: 
-    // parsed:, offset 219, len 2, h: name: SourceFile
-    // .  .  
-       00 03 
-    // parsed:, offset 221, len 4, h: length: 00000002
-    // .  .  .  .  
-       00 00 00 02 
-    // parsed:, offset 225, len 2, h: source: utf8{"T_t481_6_1.java"}
-    // .  .  
-       00 07 
-// parsed:, offset 227, len 0, h: end attributes[0] 
-// parsed:, offset 227, len 0, h: end classfile
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_6/jm/T_t481_6_1.j b/tools/dx-tests/src/dxc/junit/verify/t481_6/jm/T_t481_6_1.j
deleted file mode 100644
index 1635755..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_6/jm/T_t481_6_1.j
+++ /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_t481_6_1.java
-.class public dxc/junit/verify/t481_6/jm/T_t481_6_1
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-    
-    nop
-    nop
-    return
-    nop
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t481_6/jm/T_t481_6_1.java b/tools/dx-tests/src/dxc/junit/verify/t481_6/jm/T_t481_6_1.java
deleted file mode 100644
index 0a119d7..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t481_6/jm/T_t481_6_1.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 dxc.junit.verify.t481_6.jm;
-
-public class T_t481_6_1{
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_10/Test_t482_10.java b/tools/dx-tests/src/dxc/junit/verify/t482_10/Test_t482_10.java
deleted file mode 100644
index 8e1fa15..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_10/Test_t482_10.java
+++ /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.
- */
-
-package dxc.junit.verify.t482_10;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t482_10 extends DxTestCase {
-    /**
-     * @constraint 4.8.2.10
-     * @title Uninitialized local variable
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t482_10.jm.T_t482_10_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.10
-     * @title Uninitialized local variable
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.verify.t482_10.jm.T_t482_10_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_1.j b/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_1.j
deleted file mode 100644
index 6abfdb5..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_1.j
+++ /dev/null
@@ -1,92 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_t482_10_1.java
-.class public dxc/junit/verify/t482_10/jm/T_t482_10_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 5
-
-;    iconst_2
-;    newarray int
-;    astore_1
-
-    iconst_1
-    istore_2
-
-Label8:
-    iconst_3
-    newarray int
-    astore_1
-
-    iload_2
-    iconst_1
-    if_icmpne Label0
-
-    new java/lang/Exception
-    dup
-    invokespecial java/lang/Exception/<init>()V
-    athrow
-
-Label13:
-    goto Label0
-
-Label14:
-    astore_3
-
-Label10:
-    aload_1
-    iconst_0
-    iaload
-    istore_2
-
-Label11:
-    goto Label2
-
-Label16:
-    astore 4
-
-    iconst_1
-    istore_2
-
-    aload 4
-    athrow
-
-Label0:
-    iconst_1
-    istore_2
-
-    goto Label3
-
-Label2:
-    iconst_1
-    istore_2
-
-Label3:
-    return
-
-.catch java/lang/Exception from Label8 to Label13 using Label14
-.catch all from Label8 to Label16 using Label16
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_1.java b/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_1.java
deleted file mode 100644
index 38933b2..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_1.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 dxc.junit.verify.t482_10.jm;
-
-public class T_t482_10_1 {
-    
-    public void run(){
-        
-        int arr[];
-        arr = new int[2];
-        int f = 1;
-        
-        try{
-            arr = new int[3];
-            if(f == 1)
-                throw new Exception();
-            
-        }catch(Exception e){
-            f = arr[0];
-        }
-        finally {
-            f = 1;
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_2.j b/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_2.j
deleted file mode 100644
index c8c7b32..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_2.j
+++ /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_t482_10_2.java
-.class public dxc/junit/verify/t482_10/jm/T_t482_10_2
-.super java/lang/Object
-
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-.method public run()V
-    .limit stack 6
-    .limit locals 2
-
-    iconst_1
-    istore_1
-
-    new java/lang/Object
-    dup
-    invokespecial java/lang/Object/<init>()V
-
-Label1:        
-
-    invokevirtual java/lang/Object/getClass()Ljava/lang/Class;
-    pop
-
-Label3:
-    new java/lang/Object
-
-      iinc 1 1
-      iload_1
-      sipush 10
-      if_icmpne Label1
-
-    return
-
-.end method
-
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_2.java b/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_2.java
deleted file mode 100644
index 5c3fa5b..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_10/jm/T_t482_10_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 dxc.junit.verify.t482_10.jm;
-
-public class T_t482_10_2 {
-    
-    public void run(){
-        
-        Object o = new Object();
-        o.getClass();
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_11/Test_t482_11.java b/tools/dx-tests/src/dxc/junit/verify/t482_11/Test_t482_11.java
deleted file mode 100644
index 75b8bf1..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_11/Test_t482_11.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 dxc.junit.verify.t482_11;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-import dxc.junit.verify.t482_11.jm.T_t482_11_2;
-
-/**
- * 
- */
-public class Test_t482_11 extends DxTestCase {
-
-    /**
-     * @constraint 4.8.2.11
-     * @title  instance fields declared in the class may be accessed before
-     * calling <init>
-     */
-    public void testN1() {
-        // @uses dxc.junit.verify.t482_11.jm.TSuper
-        T_t482_11_2 t = new T_t482_11_2();
-        assertEquals(11, t.v);
-    }
-
-    /**
-     * @constraint 4.8.2.11
-     * @title  super.<init> or another <init> must be called
-     */
-    public void testVFE1() {
-        // @uses dxc.junit.verify.t482_11.jm.TSuper
-        try {
-            Class.forName("dxc.junit.verify.t482_11.jm.T_t482_11_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.11
-     * @title only instance fields declared in the class may be accessed
-     * before calling <init>
-     */
-    public void testVFE2() {
-        // @uses dxc.junit.verify.t482_11.jm.TSuper
-        try {
-            Class.forName("dxc.junit.verify.t482_11.jm.T_t482_11_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/TSuper.java b/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/TSuper.java
deleted file mode 100644
index 2b3641b..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/TSuper.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 dxc.junit.verify.t482_11.jm;
-
-public class TSuper {
-    public int s;
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_1.j b/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_1.j
deleted file mode 100644
index c773656..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_t482_11_1.java
-.class public dxc/junit/verify/t482_11/jm/T_t482_11_1
-.super dxc/junit/verify/t482_11/jm/TSuper
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-;    aload_0
-;    invokespecial dxc/junit/verify/t482_11/jm/TSuper/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_1.java b/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_1.java
deleted file mode 100644
index 7262049..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_1.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 dxc.junit.verify.t482_11.jm;
-
-public class T_t482_11_1 extends TSuper{
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_2.j b/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_2.j
deleted file mode 100644
index 78b1d64..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_2.j
+++ /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_t482_11_2.java
-.class public dxc/junit/verify/t482_11/jm/T_t482_11_2
-.super dxc/junit/verify/t482_11/jm/TSuper
-
-.field public v I
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    sipush 11
-    invokespecial dxc/junit/verify/t482_11/jm/T_t482_11_2/<init>(I)V
-
-    return
-.end method
-
-
-.method  <init>(I)V
-    .limit stack 2
-    .limit locals 2
-    
-    aload_0
-    iload_1
-    putfield dxc/junit/verify/t482_11/jm/T_t482_11_2/v I
-    
-    aload_0
-    invokespecial dxc/junit/verify/t482_11/jm/TSuper/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_2.java b/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_2.java
deleted file mode 100644
index 4d0920a..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_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 dxc.junit.verify.t482_11.jm;
-
-public class T_t482_11_2 extends TSuper{
-    public int v;
-    
-    public T_t482_11_2(){
-        this(11);
-    }
-    
-    T_t482_11_2(int i){
-        v = i;
-    }
-    
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_3.j b/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_3.j
deleted file mode 100644
index a25f0bf..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_3.j
+++ /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_t482_11_3.java
-.class public dxc/junit/verify/t482_11/jm/T_t482_11_3
-.super dxc/junit/verify/t482_11/jm/TSuper
-
-.field public v I
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    sipush 11
-    invokespecial dxc/junit/verify/t482_11/jm/T_t482_11_3/<init>(I)V
-
-    return
-.end method
-
-
-.method  <init>(I)V
-    .limit stack 2
-    .limit locals 2
-
-    aload_0
-    iload_1
-    putfield dxc/junit/verify/t482_11/jm/T_t482_11_3/s I
-    
-    aload_0
-    invokespecial dxc/junit/verify/t482_11/jm/TSuper/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_3.java b/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_3.java
deleted file mode 100644
index 64acc18..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_11/jm/T_t482_11_3.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 dxc.junit.verify.t482_11.jm;
-
-public class T_t482_11_3 extends TSuper{
-    public int v;
-    
-    public T_t482_11_3(){
-        this(11);
-    }
-    
-    T_t482_11_3(int i){
-        s = i;
-    }
-    
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_14/Test_t482_14.java b/tools/dx-tests/src/dxc/junit/verify/t482_14/Test_t482_14.java
deleted file mode 100644
index 501b2ee..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_14/Test_t482_14.java
+++ /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.
- */
-
-package dxc.junit.verify.t482_14;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t482_14 extends DxTestCase {
-    /**
-     * @constraint 4.8.2.14
-     * @title <init> may not return a value
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t482_14.jm.T_t482_14_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.14
-     * @title <clinit> may not return a value
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.verify.t482_14.jm.T_t482_14_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_1.j b/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_1.j
deleted file mode 100644
index 335dfa3..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_1.j
+++ /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_t482_14_1.java
-.class public dxc/junit/verify/t482_14/jm/T_t482_14_1
-.super java/lang/Object
-
-.field  v I
-
-.method public <init>()I
-    .limit stack 2
-    .limit locals 1
-    
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.verify.t482_14.jm.T_t482_14_1.v I
-    
-    iconst_1
-    ireturn
-
-.end method
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_1.java b/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_1.java
deleted file mode 100644
index 94afb9f..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_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 dxc.junit.verify.t482_14.jm;
-
-public class T_t482_14_1 {
-    int v = 0;
-
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_2.j b/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_2.j
deleted file mode 100644
index 49124fb..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_2.j
+++ /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_t482_14_2.java
-.class public dxc/junit/verify/t482_14/jm/T_t482_14_2
-.super java/lang/Object
-
-.field static v I
-
-
-.method static <clinit>()I
-    .limit stack 1
-    .limit locals 0
-
-    
-    iconst_0
-    putstatic dxc.junit.verify.t482_14.jm.T_t482_14_2.v I
-
-    iconst_1
-    ireturn
-
-.end method
-
-
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run()V
-    .limit stack 0
-    .limit locals 1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_2.java b/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_2.java
deleted file mode 100644
index 7ca5de2..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_14/jm/T_t482_14_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 dxc.junit.verify.t482_14.jm;
-
-public class T_t482_14_2 {
-    static int v = 0;
-
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_2/Test_t482_2.java b/tools/dx-tests/src/dxc/junit/verify/t482_2/Test_t482_2.java
deleted file mode 100644
index fb6406a..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_2/Test_t482_2.java
+++ /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.
- */
-
-package dxc.junit.verify.t482_2;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t482_2 extends DxTestCase {
-
-    /**
-     * @constraint 4.8.2.2
-     * @title operand stack depth
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t482_2.jm.T_t482_2_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_2/jm/T_t482_2_1.j b/tools/dx-tests/src/dxc/junit/verify/t482_2/jm/T_t482_2_1.j
deleted file mode 100644
index c180dd8..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_2/jm/T_t482_2_1.j
+++ /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_t482_2_1.java
-.class public dxc/junit/verify/t482_2/jm/T_t482_2_1
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-
-.end method
-
-
-
-.method public run(I)I
-    .limit stack 3
-    .limit locals 2
-    
-    iload_1
-    ifne Label1
-    iconst_1
-    
-Label1:
-    iconst_2
-    iconst_3
-    iadd    
-
-    ireturn
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_2/jm/T_t482_2_1.java b/tools/dx-tests/src/dxc/junit/verify/t482_2/jm/T_t482_2_1.java
deleted file mode 100644
index 8f5146b..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_2/jm/T_t482_2_1.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 dxc.junit.verify.t482_2.jm;
-
-public class T_t482_2_1{
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_20/Test_t482_20.java b/tools/dx-tests/src/dxc/junit/verify/t482_20/Test_t482_20.java
deleted file mode 100644
index 963bb0f..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_20/Test_t482_20.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 dxc.junit.verify.t482_20;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t482_20 extends DxTestCase {
-    /**
-     * @constraint 4.8.2.20
-     * @title no return instruction in the method
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t482_20.jm.T_t482_20_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_20/jm/T_t482_20_1.j b/tools/dx-tests/src/dxc/junit/verify/t482_20/jm/T_t482_20_1.j
deleted file mode 100644
index f803fbd..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_20/jm/T_t482_20_1.j
+++ /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_t482_20_1.java
-.class public dxc/junit/verify/t482_20/jm/T_t482_20_1
-.super java/lang/Object
-
-.method public <init>()V
-    .limit stack 1
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 1
-    .limit locals 1
-
-    iconst_1
-    pop
-    
-;    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_20/jm/T_t482_20_1.java b/tools/dx-tests/src/dxc/junit/verify/t482_20/jm/T_t482_20_1.java
deleted file mode 100644
index 6e16f99..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_20/jm/T_t482_20_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 dxc.junit.verify.t482_20.jm;
-
-public class T_t482_20_1 {
-    
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_3/Test_t482_3.java b/tools/dx-tests/src/dxc/junit/verify/t482_3/Test_t482_3.java
deleted file mode 100644
index af89d34..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_3/Test_t482_3.java
+++ /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.
- */
-
-package dxc.junit.verify.t482_3;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t482_3 extends DxTestCase {
-    /**
-     * @constraint 4.8.2.3
-     * @title attempt to split long
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t482_3.jm.T_t482_3_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.3
-     * @title attempt to split double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.verify.t482_3.jm.T_t482_3_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_1.j b/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_1.j
deleted file mode 100644
index 202e692..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_1.j
+++ /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_t482_3_1.java
-.class public dxc/junit/verify/t482_3/jm/T_t482_3_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 3
-
-    ldc2_w 123
-    lstore_1
-    
-    iload_1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_1.java b/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_1.java
deleted file mode 100644
index f61df7e..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_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 dxc.junit.verify.t482_3.jm;
-
-public class T_t482_3_1 {
-    public void run(){
-        long a = 123;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_2.j b/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_2.j
deleted file mode 100644
index 08920f0..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_2.j
+++ /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_t482_3_2.java
-.class public dxc/junit/verify/t482_3/jm/T_t482_3_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 3
-
-    ldc2_w 123.0
-    dstore_1
-    
-    fload_2
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_2.java b/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_2.java
deleted file mode 100644
index a3be92e..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_3/jm/T_t482_3_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 dxc.junit.verify.t482_3.jm;
-
-public class T_t482_3_2 {
-    public void run(){
-        double a = 123.0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_4/Test_t482_4.java b/tools/dx-tests/src/dxc/junit/verify/t482_4/Test_t482_4.java
deleted file mode 100644
index 68f8c7e..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_4/Test_t482_4.java
+++ /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.
- */
-
-package dxc.junit.verify.t482_4;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t482_4 extends DxTestCase {
-    /**
-     * @constraint 4.8.2.4
-     * @title attempt to access uninitialized int
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t482_4.jm.T_t482_4_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.4
-     * @title attempt to access uninitialized double
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.verify.t482_4.jm.T_t482_4_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.4
-     * @title attempt to access uninitialized reference
-     */
-    public void testVFE3() {
-        try {
-            Class.forName("dxc.junit.verify.t482_4.jm.T_t482_4_3");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_1.j b/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_1.j
deleted file mode 100644
index 1c0bb5e..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_1.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_t482_4_1.java
-.class public dxc/junit/verify/t482_4/jm/T_t482_4_1
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 3
-
-    iload_1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_1.java b/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_1.java
deleted file mode 100644
index 82d41c4..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_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 dxc.junit.verify.t482_4.jm;
-
-public class T_t482_4_1 {
-    public void run(){
-        long a = 123;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_2.j b/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_2.j
deleted file mode 100644
index 969c69e..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_2.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_t482_4_2.java
-.class public dxc/junit/verify/t482_4/jm/T_t482_4_2
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 3
-
-    dload_1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_2.java b/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_2.java
deleted file mode 100644
index 8683f50..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_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 dxc.junit.verify.t482_4.jm;
-
-public class T_t482_4_2 {
-    public void run(){
-        double a = 123.0;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_3.j b/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_3.j
deleted file mode 100644
index 3f7c2ce..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_3.j
+++ /dev/null
@@ -1,35 +0,0 @@
-; Copyright (C) 2008 The Android Open Source Project
-;
-; Licensed under the Apache License, Version 2.0 (the "License");
-; you may not use this file except in compliance with the License.
-; You may obtain a copy of the License at
-;
-;      http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS,
-; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-; See the License for the specific language governing permissions and
-; limitations under the License.
-
-.source T_t482_4_3.java
-.class public dxc/junit/verify/t482_4/jm/T_t482_4_3
-.super java/lang/Object
-
-.method public <init>()V
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-    return
-.end method
-
-
-
-.method public run()V
-    .limit stack 2
-    .limit locals 3
-
-    aload_1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_3.java b/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_3.java
deleted file mode 100644
index d7aa2ae..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_4/jm/T_t482_4_3.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 dxc.junit.verify.t482_4.jm;
-
-public class T_t482_4_3 {
-    public void run(){
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_8/Test_t482_8.java b/tools/dx-tests/src/dxc/junit/verify/t482_8/Test_t482_8.java
deleted file mode 100644
index 2f61e6c..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_8/Test_t482_8.java
+++ /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.
- */
-
-package dxc.junit.verify.t482_8;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t482_8 extends DxTestCase {
-    /**
-     * @constraint 4.8.2.8
-     * @title uninitialized class instance must be on the stack
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t482_8.jm.T_t482_8_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.8
-     * @title attempt to initialize initialized class
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.verify.t482_8.jm.T_t482_8_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_1.j b/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_1.j
deleted file mode 100644
index c52c248..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_1.j
+++ /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_t482_8_1.java
-.class public dxc/junit/verify/t482_8/jm/T_t482_8_1
-.super java/lang/Object
-
-
-.method  <init>(I)V
-    .limit stack 1
-    .limit locals 2
-
-;    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    return
-
-.end method
-
-
-
-.method public run()V
-    .limit stack 3
-    .limit locals 2
-
-    new dxc/junit/verify/t482_8/jm/T_t482_8_1
-    dup
-    iconst_1
-    invokespecial dxc/junit/verify/t482_8/jm/T_t482_8_1/<init>(I)V
-    astore_1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_1.java b/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_1.java
deleted file mode 100644
index 5f658cf..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_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 dxc.junit.verify.t482_8.jm;
-
-public class T_t482_8_1 {
-    T_t482_8_1(int a){
-        
-    }
-    
-    public void run(){
-        T_t482_8_1 t = new T_t482_8_1(1);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_2.j b/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_2.j
deleted file mode 100644
index 8b89868..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_2.j
+++ /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_t482_8_2.java
-.class public dxc/junit/verify/t482_8/jm/T_t482_8_2
-.super java/lang/Object
-
-
-.method  <init>(I)V
-    .limit stack 1
-    .limit locals 2
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-
-    return
-
-.end method
-
-
-
-.method public run()V
-    .limit stack 3
-    .limit locals 2
-
-    new dxc/junit/verify/t482_8/jm/T_t482_8_1
-    dup
-    iconst_1
-    invokespecial dxc/junit/verify/t482_8/jm/T_t482_8_1/<init>(I)V
-    astore_1
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_2.java b/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_2.java
deleted file mode 100644
index e14959a..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_8/jm/T_t482_8_2.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 dxc.junit.verify.t482_8.jm;
-
-public class T_t482_8_2 {
-    T_t482_8_2(int a){
-        
-    }
-    
-    public void run(){
-        T_t482_8_2 t = new T_t482_8_2(1);
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_9/Test_t482_9.java b/tools/dx-tests/src/dxc/junit/verify/t482_9/Test_t482_9.java
deleted file mode 100644
index 949b772..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_9/Test_t482_9.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 dxc.junit.verify.t482_9;
-
-import dxc.junit.DxTestCase;
-import dxc.junit.DxUtil;
-
-/**
- * 
- */
-public class Test_t482_9 extends DxTestCase {
-    /**
-     * @constraint 4.8.2.9
-     * @title attempt to access field of uninitialized class instance
-     */
-    public void testVFE1() {
-        try {
-            Class.forName("dxc.junit.verify.t482_9.jm.T_t482_9_1");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-    /**
-     * @constraint 4.8.2.9
-     * @title attempt to use method of uninitialized class instance
-     */
-    public void testVFE2() {
-        try {
-            Class.forName("dxc.junit.verify.t482_9.jm.T_t482_9_2");
-            fail("expected a verification exception");
-        } catch (Throwable t) {
-            DxUtil.checkVerifyException(t);
-        }
-    }
-
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_1.j b/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_1.j
deleted file mode 100644
index ad10f28..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_1.j
+++ /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_t482_9_1.java
-.class public dxc/junit/verify/t482_9/jm/T_t482_9_1
-.super java/lang/Object
-
-.field  v I
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.verify.t482_9.jm.T_t482_9_1.v I
-
-    return
-
-.end method
-
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/verify/t482_9/jm/T_t482_9_1
-;    dup
-;    invokespecial dxc/junit/verify/t482_9/jm/T_t482_9_1/<init>()V
-
-    iconst_1
-    putfield dxc.junit.verify.t482_9.jm.T_t482_9_1.v I
-
-    return
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_1.java b/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_1.java
deleted file mode 100644
index 2ecbbe5..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_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 dxc.junit.verify.t482_9.jm;
-
-public class T_t482_9_1 {
-    int v = 0;
-    
-    public static void run(){
-        T_t482_9_1 t = new T_t482_9_1();
-        t.v = 1;
-    }
-}
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_2.j b/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_2.j
deleted file mode 100644
index 69a9fed..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_2.j
+++ /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_t482_9_2.java
-.class public dxc/junit/verify/t482_9/jm/T_t482_9_2
-.super java/lang/Object
-
-.field  v I
-
-.method public <init>()V
-    .limit stack 2
-    .limit locals 1
-
-    aload_0
-    invokespecial java/lang/Object/<init>()V
-
-    aload_0
-    iconst_0
-    putfield dxc.junit.verify.t482_9.jm.T_t482_9_2.v I
-
-    return
-.end method
-
-
-
-.method  test()V
-    .limit stack 0
-    .limit locals 1
-    return
-.end method
-
-
-
-.method public static run()V
-    .limit stack 2
-    .limit locals 1
-
-    new dxc/junit/verify/t482_9/jm/T_t482_9_2
-;    dup
-;    invokespecial dxc/junit/verify/t482_9/jm/T_t482_9_2/<init>()V
-
-    invokevirtual dxc/junit/verify/t482_9/jm/T_t482_9_2/test()V
-
-    return
-
-.end method
diff --git a/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_2.java b/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_2.java
deleted file mode 100644
index 3ed6819..0000000
--- a/tools/dx-tests/src/dxc/junit/verify/t482_9/jm/T_t482_9_2.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 dxc.junit.verify.t482_9.jm;
-
-public class T_t482_9_2 {
-    int v = 0;
-    
-    void test() {
-        
-    }
-    
-    public static void run(){
-        T_t482_9_2 t = new T_t482_9_2();
-        t.test();
-    }
-}
diff --git a/tools/dx-tests/src/util/CollectAllTests.java b/tools/dx-tests/src/util/CollectAllTests.java
deleted file mode 100644
index 028ec27..0000000
--- a/tools/dx-tests/src/util/CollectAllTests.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES 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;
-
-import dxc.junit.AllTests;
-
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.textui.TestRunner;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Scanner;
-import java.util.Set;
-import java.util.TreeMap;
-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 CollectAllTests {
-
-    private static String PROJECT_FOLDER = "";
-    private static String PROJECT_FOLDER_OUT = "missing out folder!";
-    private static String JAVASRC_FOLDER = PROJECT_FOLDER + "/src";
-    private static HashSet<String> OPCODES = null;
-
-    /*
-     * a map. key: fully qualified class name, value: a list of test methods for
-     * the given class
-     */
-    private TreeMap<String, List<String>> map = new TreeMap<String, List<String>>();
-
-    private int testClassCnt = 0;
-    private int testMethodsCnt = 0;
-
-    private class MethodData {
-        String methodBody, constraint, title;
-    }
-
-    /**
-     * @param args
-     *            args 0 must be the project root folder (where src, lib etc.
-     *            resides)
-     *            args 1 must be the project out root folder (where the Main_*.java files
-     *            are put, and also data/scriptdata)
-     */
-    public static void main(String[] args) {
-        if (args.length >= 2) {
-            PROJECT_FOLDER = args[0];
-            PROJECT_FOLDER_OUT = args[1];
-            JAVASRC_FOLDER = PROJECT_FOLDER + "/src";
-        } else {
-            System.out.println("usage: args 0 must be the project root folder (where src, lib etc. resides)" +
-                    "and args 1 must be the project out root folder (where the Main_*.java file" +
-                    " are put, and also data/scriptdata)");
-            return;
-        }
-        
-
-        for (int i = 2; i < args.length; i++) {
-            if (OPCODES == null) {
-                OPCODES = new HashSet<String>();
-            }
-            OPCODES.add(args[i]);
-        }
-        
-        System.out.println("using java src:"+JAVASRC_FOLDER);
-        CollectAllTests cat = new CollectAllTests();
-        cat.compose();
-    }
-
-    public void compose() {
-        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('.')+1);
-        if (OPCODES != null && !OPCODES.contains(packageName)) {
-            return;
-        }
-
-        
-        String method = test.getName(); // e.g. testVFE2
-        String fqcn = test.getClass().getName(); // e.g.
-        // dxc.junit.opcodes.iload_3.Test_iload_3
-        // order: take the order of the test-suites for the classes,
-        // TODO and for methods: take Nx, then Bx, then Ex, then VFEx
-        //System.out.println("collecting test:" + test.getName() + ", class "
-        //        + test.getClass().getName());
-        testMethodsCnt++;
-        List<String> li = map.get(fqcn);
-        if (li == null) {
-            testClassCnt++;
-            li = new ArrayList<String>();
-            map.put(fqcn, li);
-        }
-        li.add(method);
-    }
-
-    private void handleTests() {
-        System.out.println("collected "+testMethodsCnt+" test methods in "+testClassCnt+" junit test classes");
-        String datafileContent = "";
-
-        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 + "()";
-            
-            String[] nameParts = pName.split("\\.");
-            if (nameParts.length != 4) {
-                throw new RuntimeException(
-                        "package name does not comply to naming scheme: " + pName);
-            }
-            
-           
-            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);
-                
-                if (dependentTestClassNames.isEmpty())
-                {
-                    continue;
-                }
-                
-
-                String content = "//autogenerated by "
-                        + this.getClass().getName()
-                        + ", do not change\n"
-                        + "package "
-                        + pName
-                        + ";\n"
-                        + "import "
-                        + pName
-                        + ".jm.*;\n"
-                        + "import dxc.junit.*;\n"
-                        + "public class Main_"
-                        + method
-                        + " extends DxAbstractMain {\n"
-                        + "public static void main(String[] args) throws Exception {\n"
-                        + "new Main_" + method + "()." + method + "();\n"
-                        + "}\n" + methodContent + "\n}\n";
-
-                writeToFile(getFileFromPackage(pName, method), content);
-
-                // 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, oradd_double
-                // 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 opcConstr = pName.substring(pName.lastIndexOf('.') + 1);
-                // beautify test title
-                if (opcConstr.startsWith("t4")) {
-                    opcConstr = "verifier"; //  + opcConstr.substring(1);
-                } else if (opcConstr.startsWith("pargs")) {
-                    opcConstr = "sanity";
-                } else if (opcConstr.startsWith("opc_")) {
-                    // unescape reserved words
-                    opcConstr = opcConstr.substring(4);
-                }
-                
-                String line = pName + ".Main_" + method + ";";                
-                for (String className : dependentTestClassNames) {
-                    try {
-                        Class.forName(className);
-                    } catch (ClassNotFoundException e) {
-                        throw new RuntimeException(
-                                "dependent class not found : " + className);
-                    } catch (Throwable e) {
-                        // ignore
-                    }
-                    
-                    line += className + " ";
-                }
-                
-                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 += ";" + opcConstr + ";"+ comment + ";" + details;
-                
-                datafileContent += line + "\n";
-                
-            }
-
-
-        }
-        new File(PROJECT_FOLDER_OUT + "/data").mkdirs();
-        writeToFile(new File(PROJECT_FOLDER_OUT + "/data/scriptdata"),
-                datafileContent);
-    }
-
-
-
-    /**
-     * 
-     * @param pName
-     * @param classOnlyName
-     * @param methodSource
-     * @return a set
-     */
-    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);
-            return entries;
-        }
-
-        MatchResult result = scanner.match();
-
-        entries.add((pName + ".jm." + 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 dx.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 from 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 from file: "
-                    + e.getClass().getName() + ", msg:" + e.getMessage());
-        }
-        
-        // using platform's default charset
-        String all = new String(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 writeToFile(File file, String content) {
-        //System.out.println("writing file " + file.getAbsolutePath());
-        try {
-            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) {
-        // e.g. dxc.junit.argsreturns.pargsreturn
-        String path = pname.replaceAll("\\.", "/");
-        String absPath = PROJECT_FOLDER_OUT + "/" + path;
-        new File(absPath).mkdirs();
-        return new File(absPath + "/Main_" + methodName + ".java");
-    }
-    
-    private byte[] readFile(File file) {
-        int len = (int) file.length();
-        byte[] res = new byte[len];
-        try {
-            FileInputStream in = new FileInputStream(file);
-            int pos = 0;
-            while (len > 0) {
-                int br = in.read(res, pos, len);
-                if (br == -1) {
-                    throw new RuntimeException("unexpected EOF for file: "+file);
-                }
-                pos += br;
-                len -= br;
-            }
-            in.close();
-        } catch (IOException ex) {
-            throw new RuntimeException("error reading file:"+file, ex);
-        }
-        return res;
-    }
-}
diff --git a/tools/dx-tests/src/util/CompileAllJasmin.java b/tools/dx-tests/src/util/CompileAllJasmin.java
deleted file mode 100644
index 834662b..0000000
--- a/tools/dx-tests/src/util/CompileAllJasmin.java
+++ /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.
- */
-
-package util;
-
-import java.io.FileInputStream;
-import java.util.Iterator;
-import java.util.Properties;
-
-import jasmin.Main;
-
-public class CompileAllJasmin {
-
-    /**
-     * @param args args[0] the (absolute or relative to the working dir) 
-     * path to the (properties) file containing line by line
-     * all jasmin files which need to be compiled.
-     * args[1] is the target directory where to put the compiled .class files to
-     */
-    public static void main(String[] args) throws Exception {
-        System.out.println("reading from "+args[0]+" and writing to "+args[1]);
-        Properties p = new Properties();
-        p.load(new FileInputStream(args[0]));
-        
-        //System.out.println("p:::"+p.toString());
-        int i=0;
-        for (Iterator<Object> it_keys = p.keySet().iterator(); it_keys.hasNext();) {
-            String file = (String) it_keys.next();
-            Main m = new jasmin.Main();
-            //java -jar $project_lib/jasmin.jar -d $javac_out $ajasminfile
-            if (i ==0) {
-                m.main(new String[] {"-d" ,args[1], file });
-            } else {
-                // leave away -d option since saved into static field
-                m.main(new String[] {file });
-            }
-            i++;
-        }
-    }
-
-}
diff --git a/tools/dx-tests/utilclasses/util/CompileAllJasmin.class b/tools/dx-tests/utilclasses/util/CompileAllJasmin.class
deleted file mode 100644
index 2b866b2..0000000
--- a/tools/dx-tests/utilclasses/util/CompileAllJasmin.class
+++ /dev/null
Binary files differ